commit e74f71eb78a4a8b9eaf1bc65f20f761648e85f76
author Al Viro <viro@zeniv.linux.org.uk> Mon Jun 20 19:38:15 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Jul 20 01:43:26 2011 -0400
tree 7bc7fc1344f5ed6e3ce8132b36125ef5cec6407c
parent 10556cb21a0d0b24d95f00ea6df16f599a3345b2

->permission() sanitizing: don't pass flags to ->inode_permission()

pass that via mask instead.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

security/security.c

diff --git a/security/security.c b/security/security.c
index 4ba6d4c..db3b750d 100644
--- a/security/security.c
+++ b/security/security.c
@@ -518,14 +518,17 @@
 {
 	if (unlikely(IS_PRIVATE(inode)))
 		return 0;
-	return security_ops->inode_permission(inode, mask, 0);
+	return security_ops->inode_permission(inode, mask);
 }
 
 int security_inode_exec_permission(struct inode *inode, unsigned int flags)
 {
+	int mask = MAY_EXEC;
 	if (unlikely(IS_PRIVATE(inode)))
 		return 0;
-	return security_ops->inode_permission(inode, MAY_EXEC, flags);
+	if (flags)
+		mask |= MAY_NOT_BLOCK;
+	return security_ops->inode_permission(inode, mask);
 }
 
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr)