From: Andreas Gruenbacher <agruenba@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Gruenbacher <agruenba@redhat.com>,
Christoph Hellwig <hch@infradead.org>,
"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
Subject: [PATCH v22 10/22] posix_acl: Improve xattr fixup code
Date: Tue, 31 May 2016 13:50:42 +0200 [thread overview]
Message-ID: <1464695454-18557-11-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1464695454-18557-1-git-send-email-agruenba@redhat.com>
Both XATTR_NAME_POSIX_ACL_ACCESS and XATTR_NAME_POSIX_ACL_DEFAULT have
the same XATTR_SYSTEM_PREFIX prefix; don't check for the same prefix
repeatedly.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Steve French <steve.french@primarydata.com>
---
fs/xattr.c | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/fs/xattr.c b/fs/xattr.c
index 4beafc4..61ac218 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -295,6 +295,16 @@ out:
}
EXPORT_SYMBOL_GPL(vfs_removexattr);
+static void
+fix_xattr_from_user(const char *kname, void *kvalue, size_t size)
+{
+ if (strncmp(kname, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
+ return;
+ kname += XATTR_SYSTEM_PREFIX_LEN;
+ if (!strcmp(kname, XATTR_POSIX_ACL_ACCESS) ||
+ !strcmp(kname, XATTR_POSIX_ACL_DEFAULT))
+ posix_acl_fix_xattr_from_user(kvalue, size);
+}
/*
* Extended attribute SET operations
@@ -329,9 +339,7 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
error = -EFAULT;
goto out;
}
- if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
- (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
- posix_acl_fix_xattr_from_user(kvalue, size);
+ fix_xattr_from_user(kname, kvalue, size);
}
error = vfs_setxattr(d, kname, kvalue, size, flags);
@@ -396,6 +404,17 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
return error;
}
+static void
+fix_xattr_to_user(const char *kname, void *kvalue, size_t size)
+{
+ if (strncmp(kname, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
+ return;
+ kname += XATTR_SYSTEM_PREFIX_LEN;
+ if (!strcmp(kname, XATTR_POSIX_ACL_ACCESS) ||
+ !strcmp(kname, XATTR_POSIX_ACL_DEFAULT))
+ posix_acl_fix_xattr_to_user(kvalue, size);
+}
+
/*
* Extended attribute GET operations
*/
@@ -426,9 +445,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
error = vfs_getxattr(d, kname, kvalue, size);
if (error > 0) {
- if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
- (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
- posix_acl_fix_xattr_to_user(kvalue, size);
+ fix_xattr_to_user(kname, kvalue, size);
if (size && copy_to_user(value, kvalue, error))
error = -EFAULT;
} else if (error == -ERANGE && size >= XATTR_SIZE_MAX) {
--
2.5.5
next prev parent reply other threads:[~2016-05-31 11:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 11:50 [PATCH v22 00/22] Richacls (Core and Ext4) Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 05/22] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 06/22] richacl: In-memory representation and helper functions Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 07/22] richacl: Permission mapping functions Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 08/22] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 09/22] richacl: Permission check algorithm Andreas Gruenbacher
2016-05-31 11:50 ` Andreas Gruenbacher [this message]
2016-05-31 11:50 ` [PATCH v22 11/22] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 12/22] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 13/22] vfs: Cache richacl in struct inode Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 14/22] richacl: Update the file masks in chmod() Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 15/22] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 16/22] richacl: Create-time inheritance Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 17/22] richacl: Automatic Inheritance Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 18/22] richacl: xattr mapping functions Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 19/22] richacl: Add richacl xattr handler Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 20/22] vfs: Add richacl permission checking Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 21/22] ext4: Add richacl support Andreas Gruenbacher
2016-05-31 11:50 ` [PATCH v22 22/22] ext4: Add richacl feature flag 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=1464695454-18557-11-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=hch@infradead.org \
--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).