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 19/22] richacl: Add richacl xattr handler
Date: Tue, 31 May 2016 13:50:51 +0200 [thread overview]
Message-ID: <1464695454-18557-20-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1464695454-18557-1-git-send-email-agruenba@redhat.com>
Add richacl xattr handler implementing the xattr operations based on the
get_richacl and set_richacl inode operations.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/richacl_xattr.c | 73 +++++++++++++++++++++++++++++++++++++++++++
include/linux/richacl_xattr.h | 2 ++
2 files changed, 75 insertions(+)
diff --git a/fs/richacl_xattr.c b/fs/richacl_xattr.c
index dc1ad36..8860f60 100644
--- a/fs/richacl_xattr.c
+++ b/fs/richacl_xattr.c
@@ -18,7 +18,9 @@
#include <linux/fs.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include <linux/xattr.h>
#include <linux/richacl_xattr.h>
+#include <uapi/linux/xattr.h>
/**
* richacl_from_xattr - convert a richacl xattr into the in-memory representation
@@ -159,3 +161,74 @@ richacl_to_xattr(struct user_namespace *user_ns,
return real_size;
}
EXPORT_SYMBOL_GPL(richacl_to_xattr);
+
+static bool
+richacl_xattr_list(struct dentry *dentry)
+{
+ return IS_RICHACL(d_backing_inode(dentry));
+}
+
+static int
+richacl_xattr_get(const struct xattr_handler *handler,
+ struct dentry *unused, struct inode *inode,
+ const char *name, void *buffer, size_t buffer_size)
+{
+ struct richacl *acl;
+ int error;
+
+ if (*name)
+ return -EINVAL;
+ if (!IS_RICHACL(inode))
+ return -EOPNOTSUPP;
+ if (S_ISLNK(inode->i_mode))
+ return -EOPNOTSUPP;
+ acl = get_richacl(inode);
+ if (IS_ERR(acl))
+ return PTR_ERR(acl);
+ if (acl == NULL)
+ return -ENODATA;
+ error = richacl_to_xattr(current_user_ns(), acl, buffer, buffer_size);
+ richacl_put(acl);
+ return error;
+}
+
+static int
+richacl_xattr_set(const struct xattr_handler *handler,
+ struct dentry *unused, struct inode *inode,
+ const char *name, const void *value, size_t size,
+ int flags)
+{
+ struct richacl *acl = NULL;
+ int ret;
+
+ if (*name)
+ return -EINVAL;
+ if (!IS_RICHACL(inode))
+ return -EOPNOTSUPP;
+ if (!inode->i_op->set_richacl)
+ return -EOPNOTSUPP;
+
+ if (!uid_eq(current_fsuid(), inode->i_uid) &&
+ inode_permission(inode, MAY_CHMOD) &&
+ !capable(CAP_FOWNER))
+ return -EPERM;
+
+ if (value) {
+ acl = richacl_from_xattr(current_user_ns(), value, size,
+ -EINVAL);
+ if (IS_ERR(acl))
+ return PTR_ERR(acl);
+ }
+
+ ret = inode->i_op->set_richacl(inode, acl);
+ richacl_put(acl);
+ return ret;
+}
+
+struct xattr_handler richacl_xattr_handler = {
+ .name = XATTR_NAME_RICHACL,
+ .list = richacl_xattr_list,
+ .get = richacl_xattr_get,
+ .set = richacl_xattr_set,
+};
+EXPORT_SYMBOL(richacl_xattr_handler);
diff --git a/include/linux/richacl_xattr.h b/include/linux/richacl_xattr.h
index 0efa14b..6c6adb1 100644
--- a/include/linux/richacl_xattr.h
+++ b/include/linux/richacl_xattr.h
@@ -26,4 +26,6 @@ extern size_t richacl_xattr_size(const struct richacl *);
extern int richacl_to_xattr(struct user_namespace *, const struct richacl *,
void *, size_t);
+extern struct xattr_handler richacl_xattr_handler;
+
#endif /* __RICHACL_XATTR_H */
--
2.5.5
next prev parent reply other threads:[~2016-05-31 11:53 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 ` [PATCH v22 10/22] posix_acl: Improve xattr fixup code Andreas Gruenbacher
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 ` Andreas Gruenbacher [this message]
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-20-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).