From b2649268e4354b4c0a771ab423b531cdcd1dc524 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Wed, 2 Mar 2011 16:54:24 +0900 Subject: [PATCH] --- yaml --- r: 235093 b: refs/heads/master c: eae61f3c829439f8f9121b5cd48a14be04df451f h: refs/heads/master i: 235091: 31f9845f4c5f9f8dd0268168e33766fa723f0209 v: v3 --- [refs] | 2 +- trunk/security/tomoyo/file.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec183babb418..b920465b34f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1adace9bb04a5f4a4dea9e642089102661bb0ceb +refs/heads/master: eae61f3c829439f8f9121b5cd48a14be04df451f diff --git a/trunk/security/tomoyo/file.c b/trunk/security/tomoyo/file.c index 9d32f182301e..cb09f1fce910 100644 --- a/trunk/security/tomoyo/file.c +++ b/trunk/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