linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: sfrench@us.ibm.com, agruen@linbit.com, dilger.kernel@dilger.ca,
	sandeen@redhat.com, tytso@mit.edu, bfields@fieldses.org,
	jlayton@redhat.com
Cc: aneesh.kumar@linux.vnet.ibm.com, linux-fsdevel@vger.kernel.org,
	linux-nfs@vger.kernel.org, linux-ext4@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Andreas Gruenbacher <agruen@suse.de>
Subject: [PATCH -V5 18/24] richacl: Check if an acl is equivalent to a file mode
Date: Wed, 23 Feb 2011 19:22:05 +0530	[thread overview]
Message-ID: <1298469131-16555-19-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1298469131-16555-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>

From: Andreas Gruenbacher <agruen@suse.de>

This function is used to avoid storing richacls on disk if the acl can
be computed from the file permission bits.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 fs/richacl_base.c       |   54 +++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/richacl.h |    1 +
 2 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/fs/richacl_base.c b/fs/richacl_base.c
index 5e926ad..e60440b 100644
--- a/fs/richacl_base.c
+++ b/fs/richacl_base.c
@@ -561,3 +561,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 630bf86..12a79f1 100644
--- a/include/linux/richacl.h
+++ b/include/linux/richacl.h
@@ -292,6 +292,7 @@ extern struct richacl *richacl_chmod(struct richacl *, mode_t);
 extern int richacl_permission(struct inode *, const struct richacl *,
 			      unsigned 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 *,
-- 
1.7.1

  parent reply	other threads:[~2011-02-23 13:52 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-23 13:51 [PATCH -V5 00/24] New ACL format for better NFSv4 acl interoperability Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 01/24] vfs: Indicate that the permission functions take all the MAY_* flags Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 04/24] vfs: Add generic IS_ACL() test for acl support Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 05/24] vfs: Add IS_RICHACL() test for richacl support Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 06/24] vfs: Optimize out IS_RICHACL() if CONFIG_FS_RICHACL is not defined Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 07/24] vfs: Add new file and directory create permission flags Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 08/24] vfs: Add delete child and delete self " Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 09/24] vfs: Make the inode passed to inode_change_ok non-const Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 10/24] vfs: Add permission flags for setting file attributes Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 11/24] vfs: Make acl_permission_check() work for richacls Aneesh Kumar K.V
2011-02-23 13:51 ` [PATCH -V5 12/24] richacl: In-memory representation and helper functions Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 13/24] richacl: Permission mapping functions Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 16/24] richacl: Permission check algorithm Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 17/24] richacl: Create-time inheritance Aneesh Kumar K.V
2011-02-23 13:52 ` Aneesh Kumar K.V [this message]
2011-02-23 13:52 ` [PATCH -V5 19/24] richacl: Automatic Inheritance Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 20/24] richacl: xattr mapping functions Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 21/24] ext4: Use IS_POSIXACL() to check for POSIX ACL support Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 22/24] vfs: Cache richacl in struct inode Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 23/24] ext4: Implement rich acl for ext4 Aneesh Kumar K.V
2011-02-23 13:52 ` [PATCH -V5 24/24] ext4: Add temporary richacl mount option " Aneesh Kumar K.V
     [not found] ` <1298469131-16555-1-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2011-02-23 13:51   ` [PATCH -V5 02/24] vfs: Pass all mask flags down to iop->check_acl Aneesh Kumar K.V
2011-02-23 13:51   ` [PATCH -V5 03/24] vfs: Add a comment to inode_permission() Aneesh Kumar K.V
2011-02-23 13:52   ` [PATCH -V5 14/24] richacl: Compute maximum file masks from an acl Aneesh Kumar K.V
2011-02-23 13:52   ` [PATCH -V5 15/24] richacl: Update the file masks in chmod() Aneesh Kumar K.V
2011-02-28 21:11   ` [PATCH -V5 00/24] New ACL format for better NFSv4 acl interoperability Ted Ts'o
2011-03-01  6:50     ` Aneesh Kumar K. V
2011-03-02 15:49       ` J. Bruce Fields
     [not found]         ` <20110302154943.GB29136-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2011-03-02 17:47           ` Aneesh Kumar K. V
     [not found]             ` <87ei6pza5v.fsf-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2011-03-02 18:58               ` J. Bruce Fields
2011-03-04 10:38                 ` Aneesh Kumar K. V
2011-03-05  0:32                   ` J. Bruce Fields
     [not found]                     ` <20110305003214.GF21260-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2011-03-05 17:58                       ` Aneesh Kumar K. V
2011-03-15  8:46                         ` Andreas Gruenbacher
2011-05-11 22:16     ` Björn JACKE
     [not found]     ` <E1QKJAl-00DGc7-EB@intern.SerNet.DE>
2011-05-13 15:40       ` Aneesh Kumar K.V

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=1298469131-16555-19-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
    --to=aneesh.kumar@linux.vnet.ibm.com \
    --cc=agruen@linbit.com \
    --cc=agruen@suse.de \
    --cc=bfields@fieldses.org \
    --cc=dilger.kernel@dilger.ca \
    --cc=jlayton@redhat.com \
    --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=sandeen@redhat.com \
    --cc=sfrench@us.ibm.com \
    --cc=tytso@mit.edu \
    /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).