Merge branch 'master'; commit 'v2.6.38-rc7' into next

[karo-tx-linux.git] / security / tomoyo / file.c

diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
index 9d32f182301ee6cfcfdb4d18508a7b9773f275eb..cb09f1fce910959f62dd6d249bc495bf6fa5d432 100644 (file)
--- 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