diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-04-05 12:21:10 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-04-05 12:21:10 -0700 |
| commit | 4ce7ea0bfbb301ffb79154b6cecd2ef030db4cdf (patch) | |
| tree | a7ad87580793912a9da208e7a9ea21d6c7768f08 /security | |
| parent | 4450182f400f1a5f50b1680faec25af2315c2849 (diff) | |
| parent | 7c4bc9c2662c6d9840afed0e29eb01314af9bb78 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38
Conflicts:
arch/arm/kernel/signal.c
drivers/mmc/card/block.c
drivers/mtd/nand/Kconfig
include/linux/amba/mmci.h
kernel/printk.c
mm/shmem.c
net/socket.c
Diffstat (limited to 'security')
| -rw-r--r-- | security/tomoyo/file.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index 9d32f182301..cb09f1fce91 100644 --- a/security/tomoyo/file.c +++ b/security/tomoyo/file.c @@ -927,7 +927,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain, struct path *path, const int flag) { const u8 acc_mode = ACC_MODE(flag); - int error = -ENOMEM; + int error = 0; struct tomoyo_path_info buf; struct tomoyo_request_info r; int idx; @@ -938,9 +938,6 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain, buf.name = NULL; r.mode = TOMOYO_CONFIG_DISABLED; idx = tomoyo_read_lock(); - if (!tomoyo_get_realpath(&buf, path)) - goto out; - error = 0; /* * If the filename is specified by "deny_rewrite" keyword, * we need to check "allow_rewrite" permission when the filename is not |