diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
commit | 0e9882b4fb8703f13921279fe4a6592574f92c62 (patch) | |
tree | 001ea9826ec3011e19986eb81cc7597d58f4f999 /security/tomoyo/file.c | |
parent | c4bb07ec0084e26323047bcbe446d59ac352e07f (diff) | |
parent | 24d6a9d07f7da6c635530688a43086ea293bf9dc (diff) |
Merge commit 'v2.6.38.1' into linaro-2.6.38
Conflicts:
drivers/usb/core/hcd-pci.c
drivers/usb/host/isp1760-hcd.c
include/linux/usb/ch9.h
Diffstat (limited to 'security/tomoyo/file.c')
-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 |