From: Andreas Gruenbacher <agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Alexander Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
Cc: "J. Bruce Fields"
<bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>,
linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Theodore Ts'o" <tytso-3s7WtUTddSA@public.gmane.org>,
linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Trond Myklebust
<trond.myklebust-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
xfs-VZNHf3L845pBDgjK7y7TUQ@public.gmane.org,
Christoph Hellwig <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>,
Andreas Dilger
<adilger.kernel-m1MBpc4rdrD3fQ9qLvQP4Q@public.gmane.org>,
linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org>,
linux-ext4-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Anna Schumaker
<anna.schumaker-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH v18 19/22] richacl: Add richacl xattr handler
Date: Mon, 29 Feb 2016 09:17:24 +0100 [thread overview]
Message-ID: <1456733847-17982-20-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1456733847-17982-1-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Add richacl xattr handler implementing the xattr operations based on the
get_richacl and set_richacl inode operations.
Signed-off-by: Andreas Gruenbacher <agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
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 a273139..afa2859 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>
MODULE_LICENSE("GPL");
@@ -160,3 +162,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 *dentry, const char *name, void *buffer,
+ size_t buffer_size)
+{
+ struct inode *inode = d_backing_inode(dentry);
+ 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 *dentry, const char *name,
+ const void *value, size_t size, int flags)
+{
+ struct inode *inode = d_backing_inode(dentry);
+ 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);
+ 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 ab67af2..ad4a56e 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.4.3
next prev parent reply other threads:[~2016-02-29 8:17 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 8:17 [PATCH v18 00/22] Richacls (Core and Ext4) Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 05/22] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 06/22] richacl: In-memory representation and helper functions Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 07/22] richacl: Permission mapping functions Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 08/22] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 09/22] richacl: Permission check algorithm Andreas Gruenbacher
2016-03-11 14:09 ` Christoph Hellwig
2016-02-29 8:17 ` [PATCH v18 10/22] posix_acl: Unexport acl_by_type and make it static Andreas Gruenbacher
2016-03-11 14:03 ` Christoph Hellwig
2016-02-29 8:17 ` [PATCH v18 12/22] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 14/22] richacl: Update the file masks in chmod() Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 15/22] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 16/22] richacl: Create-time inheritance Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 17/22] richacl: Automatic Inheritance Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 18/22] richacl: xattr mapping functions Andreas Gruenbacher
[not found] ` <1456733847-17982-19-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-03-11 14:17 ` Christoph Hellwig
[not found] ` <20160311141701.GE14808-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-11 17:03 ` Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 20/22] vfs: Add richacl permission checking Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 21/22] ext4: Add richacl support Andreas Gruenbacher
[not found] ` <1456733847-17982-22-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-03-11 14:27 ` Christoph Hellwig
2016-03-13 23:49 ` Andreas Gruenbacher
[not found] ` <20160311142719.GG14808-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-13 23:08 ` Andreas Gruenbacher
2016-03-15 7:17 ` Christoph Hellwig
[not found] ` <20160315071707.GF19747-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-16 22:38 ` Andreas Gruenbacher
2016-03-14 13:02 ` Andreas Gruenbacher
2016-03-15 7:18 ` Christoph Hellwig
2016-02-29 8:17 ` [PATCH v18 22/22] ext4: Add richacl feature flag Andreas Gruenbacher
[not found] ` <1456733847-17982-1-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-02-29 8:17 ` [PATCH v18 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 11/22] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
[not found] ` <1456733847-17982-12-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-03-11 14:07 ` Christoph Hellwig
2016-03-11 16:24 ` Andreas Gruenbacher
2016-03-15 7:12 ` Christoph Hellwig
2016-03-16 22:31 ` Andreas Gruenbacher
2016-02-29 8:17 ` [PATCH v18 13/22] vfs: Cache richacl in struct inode Andreas Gruenbacher
2016-02-29 8:17 ` Andreas Gruenbacher [this message]
[not found] ` <1456733847-17982-20-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-03-11 14:17 ` [PATCH v18 19/22] richacl: Add richacl xattr handler Christoph Hellwig
[not found] ` <20160311141735.GF14808-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-11 14:19 ` J. Bruce Fields
2016-03-15 7:10 ` Christoph Hellwig
2016-03-15 21:05 ` J. Bruce Fields
[not found] ` <20160315210526.GC3658-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2016-03-21 16:09 ` Christoph Hellwig
2016-03-11 14:01 ` [PATCH v18 00/22] Richacls (Core and Ext4) Christoph Hellwig
2016-03-11 14:07 ` J. Bruce Fields
[not found] ` <20160311140757.GB13178-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2016-03-12 21:12 ` Simo
2016-03-15 7:09 ` Christoph Hellwig
2016-03-11 16:11 ` Andreas Gruenbacher
2016-03-11 20:05 ` Steve French
2016-03-11 23:02 ` Jeremy Allison
2016-03-13 23:02 ` Andreas Gruenbacher
[not found] ` <CAHc6FU5Bq9afVdNogc9DQYyyXwLfUopXW5ZnSuct3N+NvKW4Rg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-03-14 3:54 ` Jeremy Allison
2016-03-15 7:14 ` Christoph Hellwig
[not found] ` <20160315071439.GE19747-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-16 3:40 ` Steve French
2016-03-15 7:11 ` Christoph Hellwig
[not found] ` <20160315071103.GC19747-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-15 15:45 ` Jeremy Allison
2016-03-15 20:17 ` Volker Lendecke
2016-03-16 3:28 ` Steve French
[not found] ` <20160315201700.GA22945-3ekOc4rQMZmzQB+pC5nmwQ@public.gmane.org>
2016-03-21 18:20 ` Michael Adam
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=1456733847-17982-20-git-send-email-agruenba@redhat.com \
--to=agruenba-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=adilger.kernel-m1MBpc4rdrD3fQ9qLvQP4Q@public.gmane.org \
--cc=anna.schumaker-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org \
--cc=bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org \
--cc=hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
--cc=jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org \
--cc=linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-ext4-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=trond.myklebust-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org \
--cc=tytso-3s7WtUTddSA@public.gmane.org \
--cc=viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org \
--cc=xfs-VZNHf3L845pBDgjK7y7TUQ@public.gmane.org \
/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).