summaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-19 01:56:53 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-06-20 10:45:56 -0400
commit8e833fd2e1f0107ee7a4b6bc4de3c9f0e9b0ed41 (patch)
treeadf3e53b81e9e52874fc1f38eeb09065fae5cf02 /fs/namei.c
parent6291176bcd71a2766a19a10cbd9bab07d289e1d7 (diff)
downloadop-kernel-dev-8e833fd2e1f0107ee7a4b6bc4de3c9f0e9b0ed41.zip
op-kernel-dev-8e833fd2e1f0107ee7a4b6bc4de3c9f0e9b0ed41.tar.gz
fix comment in generic_permission()
CAP_DAC_OVERRIDE is enough for MAY_EXEC on directory, even if no exec bits are set. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 975c406..0223c41 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -238,7 +238,8 @@ int generic_permission(struct inode *inode, int mask, unsigned int flags,
/*
* Read/write DACs are always overridable.
- * Executable DACs are overridable if at least one exec bit is set.
+ * Executable DACs are overridable for all directories and
+ * for non-directories that have least one exec bit set.
*/
if (!(mask & MAY_EXEC) || execute_ok(inode))
if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
OpenPOWER on IntegriCloud