From: Andreas Gruenbacher <agruenba@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
"J. Bruce Fields" <bfields@fieldses.org>,
Jeff Layton <jlayton@poochiereds.net>,
Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
Dave Chinner <david@fromorbit.com>,
linux-ext4@vger.kernel.org, xfs@oss.sgi.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v16 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests
Date: Wed, 2 Dec 2015 22:01:07 +0100 [thread overview]
Message-ID: <1449090088-9281-2-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1449090088-9281-1-git-send-email-agruenba@redhat.com>
The vfs does not apply the umask for file systems that support acls. The
test used for this used to be called IS_POSIXACL(). Switch to a new
IS_ACL() test to check for either posix acls or richacls instead. Add a new
MS_RICHACL flag and IS_RICHACL() test for richacls alone. The IS_POSIXACL()
test is still needed by nfsd.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: J. Bruce Fields <bfields@redhat.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
---
fs/Kconfig | 3 +++
fs/namei.c | 8 ++++----
include/linux/fs.h | 12 ++++++++++++
include/uapi/linux/fs.h | 3 ++-
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/fs/Kconfig b/fs/Kconfig
index 6ce72d8..379d83e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -62,6 +62,9 @@ endif # BLOCK
config FS_POSIX_ACL
def_bool n
+config FS_RICHACL
+ def_bool n
+
config EXPORTFS
tristate
diff --git a/fs/namei.c b/fs/namei.c
index d84d7c7..8573e7a 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2795,7 +2795,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
}
mode = op->mode;
- if ((open_flag & O_CREAT) && !IS_POSIXACL(dir))
+ if ((open_flag & O_CREAT) && !IS_ACL(dir))
mode &= ~current_umask();
excl = (open_flag & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT);
@@ -2979,7 +2979,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
/* Negative dentry, just create the file */
if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
umode_t mode = op->mode;
- if (!IS_POSIXACL(dir->d_inode))
+ if (!IS_ACL(dir->d_inode))
mode &= ~current_umask();
/*
* This write is needed to ensure that a
@@ -3550,7 +3550,7 @@ retry:
if (IS_ERR(dentry))
return PTR_ERR(dentry);
- if (!IS_POSIXACL(path.dentry->d_inode))
+ if (!IS_ACL(path.dentry->d_inode))
mode &= ~current_umask();
error = security_path_mknod(&path, dentry, mode, dev);
if (error)
@@ -3619,7 +3619,7 @@ retry:
if (IS_ERR(dentry))
return PTR_ERR(dentry);
- if (!IS_POSIXACL(path.dentry->d_inode))
+ if (!IS_ACL(path.dentry->d_inode))
mode &= ~current_umask();
error = security_path_mkdir(&path, dentry, mode);
if (!error)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 3aa5142..58e0a19 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1766,6 +1766,12 @@ struct super_operations {
#define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
+#ifdef CONFIG_FS_RICHACL
+#define IS_RICHACL(inode) __IS_FLG(inode, MS_RICHACL)
+#else
+#define IS_RICHACL(inode) 0
+#endif
+
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
#define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME)
#define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE)
@@ -1779,6 +1785,12 @@ struct super_operations {
(inode)->i_rdev == WHITEOUT_DEV)
/*
+ * IS_ACL() tells the VFS to not apply the umask
+ * and use check_acl for acl permission checks when defined.
+ */
+#define IS_ACL(inode) __IS_FLG(inode, MS_POSIXACL | MS_RICHACL)
+
+/*
* Inode state bits. Protected by inode->i_lock
*
* Three bits determine the dirty state of the inode, I_DIRTY_SYNC,
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index f15d980..324f438 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -81,7 +81,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 */
@@ -91,6 +91,7 @@ struct inodes_stat_t {
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
#define MS_STRICTATIME (1<<24) /* Always perform atime updates */
#define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */
+#define MS_RICHACL (1<<26) /* Supports richacls */
/* These sb flags are internal to the kernel */
#define MS_NOSEC (1<<28)
--
2.5.0
next prev parent reply other threads:[~2015-12-02 21:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 21:01 [PATCH v16 00/22] Richacls (Core and Ext4) Andreas Gruenbacher
2015-12-02 21:01 ` Andreas Gruenbacher [this message]
2015-12-02 21:01 ` [PATCH v16 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 05/22] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 06/22] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 07/22] richacl: Permission mapping functions Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 08/22] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 09/22] richacl: Permission check algorithm Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 10/22] posix_acl: Unexport acl_by_type and make it static Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 11/22] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 12/22] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 13/22] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 14/22] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 15/22] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 16/22] richacl: Create-time inheritance Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 17/22] richacl: Automatic Inheritance Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 18/22] richacl: xattr mapping functions Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 19/22] richacl: Add richacl xattr handler Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 20/22] vfs: Add richacl permission checking Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 21/22] ext4: Add richacl support Andreas Gruenbacher
2015-12-02 21:01 ` [PATCH v16 22/22] ext4: Add richacl feature flag Andreas Gruenbacher
2015-12-03 22:17 ` [PATCH v16 00/22] Richacls (Core and Ext4) Andreas Gruenbacher
2015-12-15 11:12 ` Andreas Gruenbacher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449090088-9281-2-git-send-email-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=adilger.kernel@dilger.ca \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=david@fromorbit.com \
--cc=jlayton@poochiereds.net \
--cc=linux-api@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).