From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org
Subject: [RFC 14/21] richacl: Check if an acl is equivalent to a file mode
Date: Thu, 26 Feb 2015 00:41:35 +0100 [thread overview]
Message-ID: <410d49744f16fb757be06a4c2a9e97b9eb760d70.1424907511.git.agruenba@redhat.com> (raw)
In-Reply-To: <cover.1424907511.git.agruenba@redhat.com>
In-Reply-To: <cover.1424907511.git.agruenba@redhat.com>
This function is used to avoid storing richacls if the acl can be computed from
the file permission bits.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/richacl_base.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/richacl.h | 1 +
2 files changed, 55 insertions(+)
diff --git a/fs/richacl_base.c b/fs/richacl_base.c
index 8d9dc2c..c853f7e 100644
--- a/fs/richacl_base.c
+++ b/fs/richacl_base.c
@@ -521,3 +521,57 @@ richacl_inherit(const struct richacl *dir_acl, int isdir)
return acl;
}
+
+/**
+ * richacl_equiv_mode - check if @acl is equivalent to file permission bits
+ * @mode_p: the file mode (including the file type)
+ *
+ * If @acl can be fully represented by file permission bits, this function
+ * returns 0, and the file permission bits in @mode_p are set to the equivalent
+ * of @acl.
+ *
+ * This function is used to avoid storing richacls on disk if the acl can be
+ * computed from the file permission bits. It allows user-space to make sure
+ * that a file has no explicit richacl set.
+ */
+int
+richacl_equiv_mode(const struct richacl *acl, mode_t *mode_p)
+{
+ const struct richace *ace = acl->a_entries;
+ unsigned int x;
+ mode_t mode;
+
+ if (acl->a_count != 1 ||
+ acl->a_flags != ACL4_MASKED ||
+ !richace_is_everyone(ace) ||
+ !richace_is_allow(ace) ||
+ ace->e_flags & ~ACE4_SPECIAL_WHO)
+ return -1;
+
+ /*
+ * Figure out the permissions we care about: ACE4_DELETE_CHILD is
+ * meaningless for non-directories, so we ignore it.
+ */
+ x = ~ACE4_POSIX_ALWAYS_ALLOWED;
+ if (!S_ISDIR(*mode_p))
+ x &= ~ACE4_DELETE_CHILD;
+
+ mode = richacl_masks_to_mode(acl);
+ if ((acl->a_group_mask & x) != (richacl_mode_to_mask(mode >> 3) & x) ||
+ (acl->a_other_mask & x) != (richacl_mode_to_mask(mode) & x))
+ return -1;
+
+ /*
+ * Ignore permissions which the owner is always allowed.
+ */
+ x &= ~ACE4_POSIX_OWNER_ALLOWED;
+ if ((acl->a_owner_mask & x) != (richacl_mode_to_mask(mode >> 6) & x))
+ return -1;
+
+ if ((ace->e_mask & x) != (ACE4_POSIX_MODE_ALL & x))
+ return -1;
+
+ *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(richacl_equiv_mode);
diff --git a/include/linux/richacl.h b/include/linux/richacl.h
index fd3eeb4..39072a0 100644
--- a/include/linux/richacl.h
+++ b/include/linux/richacl.h
@@ -294,6 +294,7 @@ extern void richacl_compute_max_masks(struct richacl *);
extern struct richacl *richacl_chmod(struct richacl *, mode_t);
extern int richacl_permission(struct inode *, const struct richacl *, int);
extern struct richacl *richacl_inherit(const struct richacl *, int);
+extern int richacl_equiv_mode(const struct richacl *, mode_t *);
/* richacl_inode.c */
extern struct richacl *richacl_inherit_inode(const struct richacl *,
--
2.1.0
next prev parent reply other threads:[~2015-02-25 23:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-25 23:41 [RFC 00/21] Richacls Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 01/21] vfs: Minor documentation fix Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 02/21] vfs: Shrink struct posix_acl Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 03/21] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 04/21] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 05/21] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 06/21] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 07/21] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 08/21] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 09/21] richacl: Permission mapping functions Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 10/21] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 11/21] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 12/21] richacl: Permission check algorithm Andreas Gruenbacher
[not found] ` <cover.1424907511.git.agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-02-25 23:41 ` [RFC 13/21] richacl: Create-time inheritance Andreas Gruenbacher
2015-02-25 23:41 ` Andreas Gruenbacher [this message]
2015-02-25 23:41 ` [RFC 15/21] richacl: Automatic Inheritance Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 16/21] richacl: xattr mapping functions Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 17/21] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 18/21] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 19/21] vfs: Add richacl permission checking Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 20/21] ext4: Implement rich acl for ext4 Andreas Gruenbacher
2015-02-25 23:41 ` [RFC 21/21] ext4: Add richacl feature flag Andreas Gruenbacher
2015-02-27 22:48 ` [RFC 00/21] Richacls J. Bruce Fields
2015-02-28 0:11 ` Andreas Grünbacher
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=410d49744f16fb757be06a4c2a9e97b9eb760d70.1424907511.git.agruenba@redhat.com \
--to=andreas.gruenbacher@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.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).