commit 9c2c703929e4c41210cfa6e3f599514421bab8dc
author Al Viro <viro@zeniv.linux.org.uk> Mon Jun 20 19:06:22 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Jul 20 01:43:19 2011 -0400
tree 2086738f22755ad18ba18ab2ee0f2b23d651da60
parent 1fc0f78ca9f311c6277e2f1b7655bb4d43ceb311

->permission() sanitizing: pass MAY_NOT_BLOCK to ->check_acl()

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

fs/namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 723a3fe..e0624e2 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -181,7 +181,7 @@
 	int (*check_acl)(struct inode *inode, int mask, unsigned int flags);
 	unsigned int mode = inode->i_mode;
 
-	mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
+	mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
 
 	if (current_user_ns() != inode_userns(inode))
 		goto other_perms;
@@ -204,7 +204,7 @@
 	/*
 	 * If the DACs are ok we don't need any capability check.
 	 */
-	if ((mask & ~mode) == 0)
+	if ((mask & ~mode & (MAY_READ | MAY_WRITE | MAY_EXEC)) == 0)
 		return 0;
 	return -EACCES;
 }