All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
	linux-api@vger.kernel.org, samba-technical@lists.samba.org,
	linux-security-module@vger.kernel.org,
	Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v5 08/39] richacl: Compute maximum file masks from an acl
Date: Wed, 22 Jul 2015 15:02:58 +0200	[thread overview]
Message-ID: <1437570209-29832-9-git-send-email-andreas.gruenbacher@gmail.com> (raw)
In-Reply-To: <1437570209-29832-1-git-send-email-andreas.gruenbacher@gmail.com>

From: Andreas Gruenbacher <agruenba@redhat.com>

Compute upper bound owner, group, and other file masks with as few
permissions as possible without denying any permissions that the NFSv4
acl in a richacl grants.

This algorithm is used when a file inherits an acl at create time and
when an acl is set via a mechanism that does not provide file masks
(such as setting an acl via nfsd).  When user-space sets an acl via
setxattr, the extended attribute already includes the file masks.

Setting an acl also sets the file mode permission bits: they are
determined by the file masks; see richacl_masks_to_mode().

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: J. Bruce Fields <bfields@redhat.com>
---
 fs/richacl_base.c       | 156 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/richacl.h |   1 +
 2 files changed, 157 insertions(+)

diff --git a/fs/richacl_base.c b/fs/richacl_base.c
index d12f984..23e9824 100644
--- a/fs/richacl_base.c
+++ b/fs/richacl_base.c
@@ -178,3 +178,159 @@ richacl_want_to_mask(unsigned int want)
 	return mask;
 }
 EXPORT_SYMBOL_GPL(richacl_want_to_mask);
+
+/*
+ * Note: functions like richacl_allowed_to_who(), richacl_group_class_allowed(),
+ * and richacl_compute_max_masks() iterate through the entire acl in reverse
+ * order as an optimization.
+ *
+ * In the standard algorithm, aces are considered in forward order.  When a
+ * process matches an ace, the permissions in the ace are either allowed or
+ * denied depending on the ace type.  Once a permission has been allowed or
+ * denied, it is no longer considered in further aces.
+ *
+ * By iterating through the acl in reverse order, we can compute the same
+ * result without having to keep track of which permissions have been allowed
+ * and denied already.
+ */
+
+/**
+ * richacl_allowed_to_who  -  permissions allowed to a specific who value
+ *
+ * Compute the maximum mask values allowed to a specific who value, taking
+ * everyone@ aces into account.
+ */
+static unsigned int richacl_allowed_to_who(struct richacl *acl,
+					   struct richace *who)
+{
+	struct richace *ace;
+	unsigned int allowed = 0;
+
+	richacl_for_each_entry_reverse(ace, acl) {
+		if (richace_is_inherit_only(ace))
+			continue;
+		if (richace_is_same_identifier(ace, who) ||
+		    richace_is_everyone(ace)) {
+			if (richace_is_allow(ace))
+				allowed |= ace->e_mask;
+			else if (richace_is_deny(ace))
+				allowed &= ~ace->e_mask;
+		}
+	}
+	return allowed;
+}
+
+/**
+ * richacl_group_class_allowed  -  maximum permissions the group class is allowed
+ *
+ * Compute the maximum mask values allowed to a process in the group class
+ * (i.e., a process which is not the owner but is in the owning group or
+ * matches a user or group acl entry).  This includes permissions granted or
+ * denied by everyone@ aces.
+ *
+ * See richacl_compute_max_masks().
+ */
+static unsigned int richacl_group_class_allowed(struct richacl *acl)
+{
+	struct richace *ace;
+	unsigned int everyone_allowed = 0, group_class_allowed = 0;
+	int had_group_ace = 0;
+
+	richacl_for_each_entry_reverse(ace, acl) {
+		if (richace_is_inherit_only(ace) ||
+		    richace_is_owner(ace))
+			continue;
+
+		if (richace_is_everyone(ace)) {
+			if (richace_is_allow(ace))
+				everyone_allowed |= ace->e_mask;
+			else if (richace_is_deny(ace))
+				everyone_allowed &= ~ace->e_mask;
+		} else {
+			group_class_allowed |=
+				richacl_allowed_to_who(acl, ace);
+
+			if (richace_is_group(ace))
+				had_group_ace = 1;
+		}
+	}
+	/*
+	 * If the acl doesn't contain any group@ aces, richacl_allowed_to_who()
+	 * wasn't called for the owning group.  We could make that call now, but
+	 * we already know the result (everyone_allowed).
+	 */
+	if (!had_group_ace)
+		group_class_allowed |= everyone_allowed;
+	return group_class_allowed;
+}
+
+/**
+ * richacl_compute_max_masks  -  compute upper bound masks
+ *
+ * Computes upper bound owner, group, and other masks so that none of
+ * the mask flags allowed by the acl are disabled (for any choice of the
+ * file owner or group membership).
+ */
+void richacl_compute_max_masks(struct richacl *acl, kuid_t owner)
+{
+	unsigned int gmask = ~0;
+	struct richace *ace;
+
+	/*
+	 * @gmask contains all permissions which the group class is ever
+	 * allowed.  We use it to avoid adding permissions to the group mask
+	 * from everyone@ allow aces which the group class is always denied
+	 * through other aces.  For example, the following acl would otherwise
+	 * result in a group mask of rw:
+	 *
+	 *	group@:w::deny
+	 *	everyone@:rw::allow
+	 *
+	 * Avoid computing @gmask for acls which do not include any group class
+	 * deny aces: in such acls, the group class is never denied any
+	 * permissions from everyone@ allow aces, and the group class cannot
+	 * have fewer permissions than the other class.
+	 */
+
+restart:
+	acl->a_owner_mask = 0;
+	acl->a_group_mask = 0;
+	acl->a_other_mask = 0;
+
+	richacl_for_each_entry_reverse(ace, acl) {
+		if (richace_is_inherit_only(ace))
+			continue;
+
+		if (richace_is_owner(ace) ||
+		    (richace_is_unix_user(ace) &&
+		     uid_eq(ace->e_id.uid, owner))) {
+			if (richace_is_allow(ace))
+				acl->a_owner_mask |= ace->e_mask;
+			else if (richace_is_deny(ace))
+				acl->a_owner_mask &= ~ace->e_mask;
+		} else if (richace_is_everyone(ace)) {
+			if (richace_is_allow(ace)) {
+				acl->a_owner_mask |= ace->e_mask;
+				acl->a_group_mask |= ace->e_mask & gmask;
+				acl->a_other_mask |= ace->e_mask;
+			} else if (richace_is_deny(ace)) {
+				acl->a_owner_mask &= ~ace->e_mask;
+				acl->a_group_mask &= ~ace->e_mask;
+				acl->a_other_mask &= ~ace->e_mask;
+			}
+		} else {
+			if (richace_is_allow(ace)) {
+				acl->a_owner_mask |= ace->e_mask & gmask;
+				acl->a_group_mask |= ace->e_mask & gmask;
+			} else if (richace_is_deny(ace) && gmask == ~0) {
+				gmask = richacl_group_class_allowed(acl);
+				if (likely(gmask != ~0))
+					/* should always be true */
+					goto restart;
+			}
+		}
+	}
+
+	acl->a_flags &= ~RICHACL_MASKED;
+}
+EXPORT_SYMBOL_GPL(richacl_compute_max_masks);
diff --git a/include/linux/richacl.h b/include/linux/richacl.h
index 1ae0bf8..90baca3 100644
--- a/include/linux/richacl.h
+++ b/include/linux/richacl.h
@@ -301,5 +301,6 @@ extern void richace_copy(struct richace *, const struct richace *);
 extern int richacl_masks_to_mode(const struct richacl *);
 extern unsigned int richacl_mode_to_mask(mode_t);
 extern unsigned int richacl_want_to_mask(unsigned int);
+extern void richacl_compute_max_masks(struct richacl *, kuid_t);
 
 #endif /* __RICHACL_H */
-- 
2.4.3


  parent reply	other threads:[~2015-07-22 13:22 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-22 13:02 [PATCH v5 00/39] Richacls Andreas Gruenbacher
2015-07-22 13:02 ` [PATCH v5 01/39] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-07-22 13:02 ` [PATCH v5 02/39] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-07-22 13:02   ` Andreas Gruenbacher
2015-07-22 13:02 ` [PATCH v5 03/39] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-07-22 13:02 ` [PATCH v5 04/39] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-07-22 13:02 ` [PATCH v5 05/39] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-07-22 13:02 ` [PATCH v5 06/39] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-07-22 13:02 ` [PATCH v5 07/39] richacl: Permission mapping functions Andreas Gruenbacher
2015-07-22 13:02 ` Andreas Gruenbacher [this message]
2015-07-22 13:02 ` [PATCH v5 09/39] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 10/39] richacl: Permission check algorithm Andreas Gruenbacher
2015-07-22 13:03   ` Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 11/39] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 12/39] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 13/39] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 14/39] richacl: Create-time inheritance Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 15/39] richacl: Automatic Inheritance Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 16/39] richacl: xattr mapping functions Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 17/39] vfs: Add richacl permission checking Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 18/39] ext4: Add richacl support Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 19/39] ext4: Add richacl feature flag Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 20/39] richacl: acl editing helper functions Andreas Gruenbacher
2015-07-22 13:03   ` Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 21/39] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 22/39] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 23/39] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 24/39] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 25/39] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 26/39] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 27/39] richacl: Create richacl from mode values Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 28/39] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 29/39] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 30/39] nfsd: Add richacl support Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 31/39] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 32/39] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 33/39] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 34/39] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 35/39] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 36/39] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 37/39] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 38/39] nfs: Add richacl support Andreas Gruenbacher
2015-07-22 13:03 ` [PATCH v5 39/39] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-07-22 15:57   ` Anna Schumaker
2015-07-22 15:57     ` Anna Schumaker
2015-07-22 16:08     ` 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=1437570209-29832-9-git-send-email-andreas.gruenbacher@gmail.com \
    --to=andreas.gruenbacher@gmail.com \
    --cc=agruenba@redhat.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=samba-technical@lists.samba.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 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.