aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-15 11:01:26 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:25:22 -0700
commitce7f57fda208232c6dfbaa20e49ff1e98860aa7c (patch)
tree4fcc2bab4d309a488025575e803327e828200ed1 /security
parent8fc3be45ac87794bb21a278afb586b6b3c7590c3 (diff)
downloadlinux-linaro-precise-ce7f57fda208232c6dfbaa20e49ff1e98860aa7c.tar.gz
UBUNTU: ubuntu: Yama - update calls to generic_permission() and inode->i_op->permission()
commit 178ea73521d64ba41d7aa5488fb9f549c6d4507d Author: Al Viro <viro@zeniv.linux.org.uk> Date: Mon Jun 20 11:31:30 2011 -0400 kill check_acl callback of generic_permission() commit 2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 Author: Al Viro <viro@zeniv.linux.org.uk> Date: Mon Jun 20 19:16:29 2011 -0400 ->permission() sanitizing: don't pass flags to generic_permission() commit 10556cb21a0d0b24d95f00ea6df16f599a3345b2 Author: Al Viro <viro@zeniv.linux.org.uk> Date: Mon Jun 20 19:28:19 2011 -0400 ->permission() sanitizing: don't pass flags to ->permission() Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'security')
-rw-r--r--security/yama/yama_lsm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 23d4111d077..3a7df5d9777 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -331,10 +331,9 @@ static int yama_generic_permission(struct inode *inode, int mask)
int retval;
if (inode->i_op->permission)
- retval = inode->i_op->permission(inode, mask, 0);
+ retval = inode->i_op->permission(inode, mask);
else
- retval = generic_permission(inode, mask, 0,
- inode->i_op->check_acl);
+ retval = generic_permission(inode, mask);
return retval;
}