summaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 19:12:17 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:21 -0400
commit7e40145eb111a5192e6d819f764db9d6828d1abb (patch)
tree3249952a751de12465e8d66c63328445e9242f3a /fs/namei.c
parent9c2c703929e4c41210cfa6e3f599514421bab8dc (diff)
->permission() sanitizing: don't pass flags to ->check_acl()
not used in the instances anymore. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c
index e0624e2f0bba..560fd1dff1d0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -176,9 +176,9 @@ EXPORT_SYMBOL(putname);
176/* 176/*
177 * This does basic POSIX ACL permission checking 177 * This does basic POSIX ACL permission checking
178 */ 178 */
179static int acl_permission_check(struct inode *inode, int mask, unsigned int flags) 179static int acl_permission_check(struct inode *inode, int mask)
180{ 180{
181 int (*check_acl)(struct inode *inode, int mask, unsigned int flags); 181 int (*check_acl)(struct inode *inode, int mask);
182 unsigned int mode = inode->i_mode; 182 unsigned int mode = inode->i_mode;
183 183
184 mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK; 184 mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
@@ -191,7 +191,7 @@ static int acl_permission_check(struct inode *inode, int mask, unsigned int flag
191 else { 191 else {
192 check_acl = inode->i_op->check_acl; 192 check_acl = inode->i_op->check_acl;
193 if (IS_POSIXACL(inode) && (mode & S_IRWXG) && check_acl) { 193 if (IS_POSIXACL(inode) && (mode & S_IRWXG) && check_acl) {
194 int error = check_acl(inode, mask, flags); 194 int error = check_acl(inode, mask);
195 if (error != -EAGAIN) 195 if (error != -EAGAIN)
196 return error; 196 return error;
197 } 197 }
@@ -231,7 +231,7 @@ int generic_permission(struct inode *inode, int mask, unsigned int flags)
231 /* 231 /*
232 * Do the basic POSIX ACL permission checks. 232 * Do the basic POSIX ACL permission checks.
233 */ 233 */
234 ret = acl_permission_check(inode, mask, flags); 234 ret = acl_permission_check(inode, mask);
235 if (ret != -EACCES) 235 if (ret != -EACCES)
236 return ret; 236 return ret;
237 237
@@ -327,7 +327,7 @@ static inline int exec_permission(struct inode *inode, unsigned int flags)
327 if (likely(!ret)) 327 if (likely(!ret))
328 goto ok; 328 goto ok;
329 } else { 329 } else {
330 ret = acl_permission_check(inode, mask, flags); 330 ret = acl_permission_check(inode, mask);
331 if (likely(!ret)) 331 if (likely(!ret))
332 goto ok; 332 goto ok;
333 if (ret != -EACCES) 333 if (ret != -EACCES)