From: Andreas Gruenbacher <agruenba@redhat.com> To: Alexander Viro <viro@zeniv.linux.org.uk>, "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 Cc: Andreas Gruenbacher <agruenba@redhat.com> Subject: [PATCH v15 15/22] richacl: Check if an acl is equivalent to a file mode Date: Mon, 9 Nov 2015 12:08:56 +0100 [thread overview] Message-ID: <1447067343-31479-16-git-send-email-agruenba@redhat.com> (raw) In-Reply-To: <1447067343-31479-1-git-send-email-agruenba@redhat.com> ACLs are considered equivalent to file modes if they only consist of owner@, group@, and everyone@ entries, the owner@ permissions do not depend on whether the owner is a member in the owning group, and no inheritance flags are set. This test 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> Reviewed-by: J. Bruce Fields <bfields@redhat.com> --- fs/richacl_base.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/richacl.h | 1 + 2 files changed, 105 insertions(+) diff --git a/fs/richacl_base.c b/fs/richacl_base.c index e4dd779..74e5cb5 100644 --- a/fs/richacl_base.c +++ b/fs/richacl_base.c @@ -382,3 +382,107 @@ __richacl_chmod(struct richacl *acl, umode_t mode) return clone; } EXPORT_SYMBOL_GPL(__richacl_chmod); + +/** + * richacl_equiv_mode - compute the mode equivalent of @acl + * + * An acl is considered equivalent to a file mode if it only consists of + * owner@, group@, and everyone@ entries and the owner@ permissions do not + * depend on whether the owner is a member in the owning group. + */ +int +richacl_equiv_mode(const struct richacl *acl, umode_t *mode_p) +{ + umode_t mode = *mode_p; + + /* + * The RICHACE_DELETE_CHILD flag is meaningless for non-directories, so + * we ignore it. + */ + unsigned int x = S_ISDIR(mode) ? 0 : RICHACE_DELETE_CHILD; + struct { + unsigned int allowed; + unsigned int defined; /* allowed or denied */ + } owner = { + .defined = RICHACE_POSIX_ALWAYS_ALLOWED | + RICHACE_POSIX_OWNER_ALLOWED | x, + }, group = { + .defined = RICHACE_POSIX_ALWAYS_ALLOWED | x, + }, everyone = { + .defined = RICHACE_POSIX_ALWAYS_ALLOWED | x, + }; + const struct richace *ace; + + if (acl->a_flags & ~(RICHACL_WRITE_THROUGH | RICHACL_MASKED)) + return -1; + + richacl_for_each_entry(ace, acl) { + if (ace->e_flags & ~RICHACE_SPECIAL_WHO) + return -1; + + if (richace_is_owner(ace) || richace_is_everyone(ace)) { + x = ace->e_mask & ~owner.defined; + if (richace_is_allow(ace)) { + unsigned int group_denied = + group.defined & ~group.allowed; + + if (x & group_denied) + return -1; + owner.allowed |= x; + } else /* if (richace_is_deny(ace)) */ { + if (x & group.allowed) + return -1; + } + owner.defined |= x; + + if (richace_is_everyone(ace)) { + x = ace->e_mask; + if (richace_is_allow(ace)) { + group.allowed |= + x & ~group.defined; + everyone.allowed |= + x & ~everyone.defined; + } + group.defined |= x; + everyone.defined |= x; + } + } else if (richace_is_group(ace)) { + x = ace->e_mask & ~group.defined; + if (richace_is_allow(ace)) + group.allowed |= x; + group.defined |= x; + } else + return -1; + } + + if (group.allowed & ~owner.defined) + return -1; + + if (acl->a_flags & RICHACL_MASKED) { + if (acl->a_flags & RICHACL_WRITE_THROUGH) { + owner.allowed = acl->a_owner_mask; + everyone.allowed = acl->a_other_mask; + } else { + owner.allowed &= acl->a_owner_mask; + everyone.allowed &= acl->a_other_mask; + } + group.allowed &= acl->a_group_mask; + } + + mode = (mode & ~S_IRWXUGO) | + (richacl_mask_to_mode(owner.allowed) << 6) | + (richacl_mask_to_mode(group.allowed) << 3) | + richacl_mask_to_mode(everyone.allowed); + + /* Mask flags we can ignore */ + x = S_ISDIR(mode) ? 0 : RICHACE_DELETE_CHILD; + + if (((richacl_mode_to_mask(mode >> 6) ^ owner.allowed) & ~x) || + ((richacl_mode_to_mask(mode >> 3) ^ group.allowed) & ~x) || + ((richacl_mode_to_mask(mode) ^ everyone.allowed) & ~x)) + return -1; + + *mode_p = mode; + return 0; +} +EXPORT_SYMBOL_GPL(richacl_equiv_mode); diff --git a/include/linux/richacl.h b/include/linux/richacl.h index a2d5600..b7128bf 100644 --- a/include/linux/richacl.h +++ b/include/linux/richacl.h @@ -185,6 +185,7 @@ extern unsigned int richacl_mode_to_mask(umode_t); extern unsigned int richacl_want_to_mask(unsigned int); extern void richacl_compute_max_masks(struct richacl *); extern struct richacl *__richacl_chmod(struct richacl *, umode_t); +extern int richacl_equiv_mode(const struct richacl *, umode_t *); /* richacl_inode.c */ extern int richacl_permission(struct inode *, const struct richacl *, int); -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Andreas Gruenbacher <agruenba@redhat.com> To: Alexander Viro <viro@zeniv.linux.org.uk>, 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 Cc: Andreas Gruenbacher <agruenba@redhat.com> Subject: [PATCH v15 15/22] richacl: Check if an acl is equivalent to a file mode Date: Mon, 9 Nov 2015 12:08:56 +0100 [thread overview] Message-ID: <1447067343-31479-16-git-send-email-agruenba@redhat.com> (raw) In-Reply-To: <1447067343-31479-1-git-send-email-agruenba@redhat.com> ACLs are considered equivalent to file modes if they only consist of owner@, group@, and everyone@ entries, the owner@ permissions do not depend on whether the owner is a member in the owning group, and no inheritance flags are set. This test 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> Reviewed-by: J. Bruce Fields <bfields@redhat.com> --- fs/richacl_base.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/richacl.h | 1 + 2 files changed, 105 insertions(+) diff --git a/fs/richacl_base.c b/fs/richacl_base.c index e4dd779..74e5cb5 100644 --- a/fs/richacl_base.c +++ b/fs/richacl_base.c @@ -382,3 +382,107 @@ __richacl_chmod(struct richacl *acl, umode_t mode) return clone; } EXPORT_SYMBOL_GPL(__richacl_chmod); + +/** + * richacl_equiv_mode - compute the mode equivalent of @acl + * + * An acl is considered equivalent to a file mode if it only consists of + * owner@, group@, and everyone@ entries and the owner@ permissions do not + * depend on whether the owner is a member in the owning group. + */ +int +richacl_equiv_mode(const struct richacl *acl, umode_t *mode_p) +{ + umode_t mode = *mode_p; + + /* + * The RICHACE_DELETE_CHILD flag is meaningless for non-directories, so + * we ignore it. + */ + unsigned int x = S_ISDIR(mode) ? 0 : RICHACE_DELETE_CHILD; + struct { + unsigned int allowed; + unsigned int defined; /* allowed or denied */ + } owner = { + .defined = RICHACE_POSIX_ALWAYS_ALLOWED | + RICHACE_POSIX_OWNER_ALLOWED | x, + }, group = { + .defined = RICHACE_POSIX_ALWAYS_ALLOWED | x, + }, everyone = { + .defined = RICHACE_POSIX_ALWAYS_ALLOWED | x, + }; + const struct richace *ace; + + if (acl->a_flags & ~(RICHACL_WRITE_THROUGH | RICHACL_MASKED)) + return -1; + + richacl_for_each_entry(ace, acl) { + if (ace->e_flags & ~RICHACE_SPECIAL_WHO) + return -1; + + if (richace_is_owner(ace) || richace_is_everyone(ace)) { + x = ace->e_mask & ~owner.defined; + if (richace_is_allow(ace)) { + unsigned int group_denied = + group.defined & ~group.allowed; + + if (x & group_denied) + return -1; + owner.allowed |= x; + } else /* if (richace_is_deny(ace)) */ { + if (x & group.allowed) + return -1; + } + owner.defined |= x; + + if (richace_is_everyone(ace)) { + x = ace->e_mask; + if (richace_is_allow(ace)) { + group.allowed |= + x & ~group.defined; + everyone.allowed |= + x & ~everyone.defined; + } + group.defined |= x; + everyone.defined |= x; + } + } else if (richace_is_group(ace)) { + x = ace->e_mask & ~group.defined; + if (richace_is_allow(ace)) + group.allowed |= x; + group.defined |= x; + } else + return -1; + } + + if (group.allowed & ~owner.defined) + return -1; + + if (acl->a_flags & RICHACL_MASKED) { + if (acl->a_flags & RICHACL_WRITE_THROUGH) { + owner.allowed = acl->a_owner_mask; + everyone.allowed = acl->a_other_mask; + } else { + owner.allowed &= acl->a_owner_mask; + everyone.allowed &= acl->a_other_mask; + } + group.allowed &= acl->a_group_mask; + } + + mode = (mode & ~S_IRWXUGO) | + (richacl_mask_to_mode(owner.allowed) << 6) | + (richacl_mask_to_mode(group.allowed) << 3) | + richacl_mask_to_mode(everyone.allowed); + + /* Mask flags we can ignore */ + x = S_ISDIR(mode) ? 0 : RICHACE_DELETE_CHILD; + + if (((richacl_mode_to_mask(mode >> 6) ^ owner.allowed) & ~x) || + ((richacl_mode_to_mask(mode >> 3) ^ group.allowed) & ~x) || + ((richacl_mode_to_mask(mode) ^ everyone.allowed) & ~x)) + return -1; + + *mode_p = mode; + return 0; +} +EXPORT_SYMBOL_GPL(richacl_equiv_mode); diff --git a/include/linux/richacl.h b/include/linux/richacl.h index a2d5600..b7128bf 100644 --- a/include/linux/richacl.h +++ b/include/linux/richacl.h @@ -185,6 +185,7 @@ extern unsigned int richacl_mode_to_mask(umode_t); extern unsigned int richacl_want_to_mask(unsigned int); extern void richacl_compute_max_masks(struct richacl *); extern struct richacl *__richacl_chmod(struct richacl *, umode_t); +extern int richacl_equiv_mode(const struct richacl *, umode_t *); /* richacl_inode.c */ extern int richacl_permission(struct inode *, const struct richacl *, int); -- 2.5.0 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-11-09 11:08 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-09 11:08 [PATCH v15 00/22] Richacls (Core and Ext4) Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 05/22] vfs: Add permission flags for setting file attributes Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 06/22] richacl: In-memory representation and helper functions Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 07/22] richacl: Permission mapping functions Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 08/22] richacl: Compute maximum file masks from an acl Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 09/22] richacl: Permission check algorithm Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 10/22] posix_acl: Unexport acl_by_type and make it static Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher [not found] ` <1447067343-31479-1-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-11-09 11:08 ` [PATCH v15 11/22] vfs: Cache base_acl objects in inodes Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:09 ` [PATCH v15 22/22] ext4: Add richacl feature flag Andreas Gruenbacher 2015-11-09 11:09 ` Andreas Gruenbacher 2015-11-09 11:09 ` Andreas Gruenbacher 2015-11-10 11:29 ` [PATCH v15 00/22] Richacls (Core and Ext4) Christoph Hellwig 2015-11-10 11:29 ` Christoph Hellwig 2015-11-10 11:29 ` Christoph Hellwig [not found] ` <20151110112943.GA17038-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2015-11-10 12:39 ` Andreas Gruenbacher 2015-11-10 12:39 ` Andreas Gruenbacher 2015-11-10 12:39 ` Andreas Gruenbacher [not found] ` <CAHc6FU5g7=wd1Wt4+GCaLJjNu7giruZyAON3VcYn-A=ffYMsmw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-11-10 16:43 ` Steve French 2015-11-10 16:43 ` Steve French 2015-11-10 16:43 ` Steve French 2015-11-10 17:07 ` J. Bruce Fields 2015-11-10 17:07 ` J. Bruce Fields 2015-11-10 17:58 ` Andreas Gruenbacher 2015-11-10 17:58 ` Andreas Gruenbacher [not found] ` <CAHc6FU6aWsWO1SOSyNVnbObE0GoE4dr5a3WVTgvX4xn0wum1Fg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-11-10 19:17 ` J. Bruce Fields 2015-11-10 19:17 ` J. Bruce Fields 2015-11-10 19:17 ` J. Bruce Fields 2015-11-11 7:57 ` Christoph Hellwig 2015-11-11 7:57 ` Christoph Hellwig 2015-11-11 7:57 ` Christoph Hellwig [not found] ` <20151111075707.GA23752-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2015-11-11 13:59 ` Andreas Gruenbacher 2015-11-11 13:59 ` Andreas Gruenbacher 2015-11-11 13:59 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 12/22] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 13/22] vfs: Cache richacl in struct inode Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 14/22] richacl: Update the file masks in chmod() Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher [this message] 2015-11-09 11:08 ` [PATCH v15 15/22] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 16/22] richacl: Create-time inheritance Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 17/22] richacl: Automatic Inheritance Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:08 ` [PATCH v15 18/22] richacl: xattr mapping functions Andreas Gruenbacher 2015-11-09 11:08 ` Andreas Gruenbacher 2015-11-09 11:09 ` [PATCH v15 19/22] richacl: Add richacl xattr handler Andreas Gruenbacher 2015-11-09 11:09 ` Andreas Gruenbacher 2015-11-11 1:16 ` Andreas Gruenbacher 2015-11-11 1:16 ` Andreas Gruenbacher 2015-11-09 11:09 ` [PATCH v15 20/22] vfs: Add richacl permission checking Andreas Gruenbacher 2015-11-09 11:09 ` Andreas Gruenbacher 2015-11-09 11:09 ` [PATCH v15 21/22] ext4: Add richacl support Andreas Gruenbacher 2015-11-09 11:09 ` 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=1447067343-31479-16-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=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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.