74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
|
From: Andreas Gruenbacher <agruen@suse.de>
|
||
|
|
Date: Fri, 11 Jun 2010 16:12:45 +0530
|
||
|
|
Subject: [PATCH 02/16] vfs: Add generic IS_ACL() test for acl support
|
||
|
|
Patch-mainline: not yet
|
||
|
|
|
||
|
|
When IS_POSIXACL() is true, the vfs does not apply the umask. Other acl
|
||
|
|
models will need the same exception, so introduce a separate IS_ACL()
|
||
|
|
test.
|
||
|
|
|
||
|
|
The IS_POSIX_ACL() test is still needed so that nfsd can determine when
|
||
|
|
the underlying file system supports POSIX ACLs (as opposed to some other
|
||
|
|
kind).
|
||
|
|
|
||
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
||
|
|
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
||
|
|
---
|
||
|
|
fs/namei.c | 6 +++---
|
||
|
|
include/linux/fs.h | 8 +++++++-
|
||
|
|
2 files changed, 10 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/fs/namei.c
|
||
|
|
+++ b/fs/namei.c
|
||
|
|
@@ -2215,7 +2215,7 @@ static int __open_namei_create(struct na
|
||
|
|
int error;
|
||
|
|
struct dentry *dir = nd->path.dentry;
|
||
|
|
|
||
|
|
- if (!IS_POSIXACL(dir->d_inode))
|
||
|
|
+ if (!IS_ACL(dir->d_inode))
|
||
|
|
mode &= ~current_umask();
|
||
|
|
error = security_path_mknod(&nd->path, path->dentry, mode, 0);
|
||
|
|
if (error)
|
||
|
|
@@ -2749,7 +2749,7 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
|
||
|
|
error = PTR_ERR(dentry);
|
||
|
|
goto out_unlock;
|
||
|
|
}
|
||
|
|
- if (!IS_POSIXACL(nd.path.dentry->d_inode))
|
||
|
|
+ if (!IS_ACL(nd.path.dentry->d_inode))
|
||
|
|
mode &= ~current_umask();
|
||
|
|
error = may_mknod(mode);
|
||
|
|
if (error)
|
||
|
|
@@ -2826,7 +2826,7 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
|
||
|
|
if (IS_ERR(dentry))
|
||
|
|
goto out_unlock;
|
||
|
|
|
||
|
|
- if (!IS_POSIXACL(nd.path.dentry->d_inode))
|
||
|
|
+ if (!IS_ACL(nd.path.dentry->d_inode))
|
||
|
|
mode &= ~current_umask();
|
||
|
|
error = mnt_want_write(nd.path.mnt);
|
||
|
|
if (error)
|
||
|
|
--- a/include/linux/fs.h
|
||
|
|
+++ b/include/linux/fs.h
|
||
|
|
@@ -205,7 +205,7 @@ struct inodes_stat_t {
|
||
|
|
#define MS_VERBOSE 32768 /* War is peace. Verbosity is silence.
|
||
|
|
MS_VERBOSE is deprecated. */
|
||
|
|
#define MS_SILENT 32768
|
||
|
|
-#define MS_POSIXACL (1<<16) /* VFS does not apply the umask */
|
||
|
|
+#define MS_POSIXACL (1<<16) /* Supports POSIX ACLs */
|
||
|
|
#define MS_UNBINDABLE (1<<17) /* change to unbindable */
|
||
|
|
#define MS_PRIVATE (1<<18) /* change to private */
|
||
|
|
#define MS_SLAVE (1<<19) /* change to slave */
|
||
|
|
@@ -280,6 +280,12 @@ struct inodes_stat_t {
|
||
|
|
#define IS_IMA(inode) ((inode)->i_flags & S_IMA)
|
||
|
|
#define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT)
|
||
|
|
|
||
|
|
+/*
|
||
|
|
+ * IS_ACL() tells the VFS to not apply the umask
|
||
|
|
+ * and use iop->check_acl for acl permission checks when defined.
|
||
|
|
+ */
|
||
|
|
+#define IS_ACL(inode) __IS_FLG(inode, MS_POSIXACL)
|
||
|
|
+
|
||
|
|
/* the read-only stuff doesn't really belong here, but any other place is
|
||
|
|
probably as bad and I don't want to create yet another include file. */
|
||
|
|
|