All of lore.kernel.org
 help / color / mirror / Atom feed
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 v3 11/45] richacl: Permission mapping functions
Date: Fri, 24 Apr 2015 13:04:08 +0200	[thread overview]
Message-ID: <3c47aff8235025acfc8df84e354a799a4159a048.1429868795.git.agruenba@redhat.com> (raw)
In-Reply-To: <cover.1429868795.git.agruenba@redhat.com>
In-Reply-To: <cover.1429868795.git.agruenba@redhat.com>

We need to map from POSIX permissions to NFSv4 permissions when a
chmod() is done, from NFSv4 permissions to POSIX permissions when an acl
is set (which implicitly sets the file permission bits), and from the
MAY_READ/MAY_WRITE/MAY_EXEC/MAY_APPEND flags to NFSv4 permissions when
doing an access check in a richacl.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 fs/richacl_base.c       | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/richacl.h |  46 +++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/fs/richacl_base.c b/fs/richacl_base.c
index 164b902..978f221 100644
--- a/fs/richacl_base.c
+++ b/fs/richacl_base.c
@@ -56,3 +56,119 @@ richacl_clone(const struct richacl *acl, gfp_t gfp)
 	}
 	return dup;
 }
+
+/**
+ * richacl_mask_to_mode  -  compute the file permission bits which correspond to @mask
+ * @mask:	%RICHACE_* permission mask
+ *
+ * See richacl_masks_to_mode().
+ */
+static int
+richacl_mask_to_mode(unsigned int mask)
+{
+	int mode = 0;
+
+	if (mask & RICHACE_POSIX_MODE_READ)
+		mode |= S_IROTH;
+	if (mask & RICHACE_POSIX_MODE_WRITE)
+		mode |= S_IWOTH;
+	if (mask & RICHACE_POSIX_MODE_EXEC)
+		mode |= S_IXOTH;
+
+	return mode;
+}
+
+/**
+ * richacl_masks_to_mode  -  compute the file permission bits from the file masks
+ *
+ * When setting a richacl, we set the file permission bits to indicate maximum
+ * permissions: for example, we set the Write permission when a mask contains
+ * RICHACE_APPEND_DATA even if it does not also contain RICHACE_WRITE_DATA.
+ *
+ * Permissions which are not in RICHACE_POSIX_MODE_READ, RICHACE_POSIX_MODE_WRITE, or
+ * RICHACE_POSIX_MODE_EXEC cannot be represented in the file permission bits.
+ * Such permissions can still be effective, but not for new files or after a
+ * chmod(); they must be explicitly enabled in the richacl.
+ */
+int
+richacl_masks_to_mode(const struct richacl *acl)
+{
+	return richacl_mask_to_mode(acl->a_owner_mask) << 6 |
+	       richacl_mask_to_mode(acl->a_group_mask) << 3 |
+	       richacl_mask_to_mode(acl->a_other_mask);
+}
+EXPORT_SYMBOL_GPL(richacl_masks_to_mode);
+
+/**
+ * richacl_mode_to_mask  - compute a file mask from the lowest three mode bits
+ *
+ * When the file permission bits of a file are set with chmod(), this specifies
+ * the maximum permissions that processes will get.  All permissions beyond
+ * that will be removed from the file masks, and become ineffective.
+ *
+ * We also add in the permissions which are always allowed no matter what the
+ * acl says.
+ */
+unsigned int
+richacl_mode_to_mask(mode_t mode)
+{
+	unsigned int mask = RICHACE_POSIX_ALWAYS_ALLOWED;
+
+	if (mode & S_IROTH)
+		mask |= RICHACE_POSIX_MODE_READ;
+	if (mode & S_IWOTH)
+		mask |= RICHACE_POSIX_MODE_WRITE;
+	if (mode & S_IXOTH)
+		mask |= RICHACE_POSIX_MODE_EXEC;
+
+	return mask;
+}
+
+/**
+ * richacl_want_to_mask  - convert the iop->permission want argument to a mask
+ * @want:	@want argument of the permission inode operation
+ *
+ * When checking for append, @want is (MAY_WRITE | MAY_APPEND).
+ *
+ * Richacls use the iop->may_create and iop->may_delete hooks which are
+ * used for checking if creating and deleting files is allowed.  These hooks do
+ * not use richacl_want_to_mask(), so we do not have to deal with mapping
+ * MAY_WRITE to RICHACE_ADD_FILE, RICHACE_ADD_SUBDIRECTORY, and RICHACE_DELETE_CHILD
+ * here.
+ */
+unsigned int
+richacl_want_to_mask(unsigned int want)
+{
+	unsigned int mask = 0;
+
+	if (want & MAY_READ)
+		mask |= RICHACE_READ_DATA;
+	if (want & MAY_DELETE_SELF)
+		mask |= RICHACE_DELETE;
+	if (want & MAY_TAKE_OWNERSHIP)
+		mask |= RICHACE_WRITE_OWNER;
+	if (want & MAY_CHMOD)
+		mask |= RICHACE_WRITE_ACL;
+	if (want & MAY_SET_TIMES)
+		mask |= RICHACE_WRITE_ATTRIBUTES;
+	if (want & MAY_EXEC)
+		mask |= RICHACE_EXECUTE;
+	/*
+	 * differentiate MAY_WRITE from these request
+	 */
+	if (want & (MAY_APPEND |
+		    MAY_CREATE_FILE | MAY_CREATE_DIR |
+		    MAY_DELETE_CHILD)) {
+		if (want & MAY_APPEND)
+			mask |= RICHACE_APPEND_DATA;
+		if (want & MAY_CREATE_FILE)
+			mask |= RICHACE_ADD_FILE;
+		if (want & MAY_CREATE_DIR)
+			mask |= RICHACE_ADD_SUBDIRECTORY;
+		if (want & MAY_DELETE_CHILD)
+			mask |= RICHACE_DELETE_CHILD;
+	} else if (want & MAY_WRITE)
+		mask |= RICHACE_WRITE_DATA;
+	return mask;
+}
+EXPORT_SYMBOL_GPL(richacl_want_to_mask);
diff --git a/include/linux/richacl.h b/include/linux/richacl.h
index 1499e7d..d19843b 100644
--- a/include/linux/richacl.h
+++ b/include/linux/richacl.h
@@ -118,6 +118,49 @@ struct richacl {
 	RICHACE_WRITE_OWNER |					\
 	RICHACE_SYNCHRONIZE)
 
+/*
+ * The POSIX permissions are supersets of the following NFSv4 permissions:
+ *
+ *  - MAY_READ maps to READ_DATA or LIST_DIRECTORY, depending on the type
+ *    of the file system object.
+ *
+ *  - MAY_WRITE maps to WRITE_DATA or RICHACE_APPEND_DATA for files, and to
+ *    ADD_FILE, RICHACE_ADD_SUBDIRECTORY, or RICHACE_DELETE_CHILD for directories.
+ *
+ *  - MAY_EXECUTE maps to RICHACE_EXECUTE.
+ *
+ *  (Some of these NFSv4 permissions have the same bit values.)
+ */
+#define RICHACE_POSIX_MODE_READ (			\
+		RICHACE_READ_DATA |		\
+		RICHACE_LIST_DIRECTORY)
+#define RICHACE_POSIX_MODE_WRITE (			\
+		RICHACE_WRITE_DATA |		\
+		RICHACE_ADD_FILE |			\
+		RICHACE_APPEND_DATA |		\
+		RICHACE_ADD_SUBDIRECTORY |		\
+		RICHACE_DELETE_CHILD)
+#define RICHACE_POSIX_MODE_EXEC RICHACE_EXECUTE
+#define RICHACE_POSIX_MODE_ALL (			\
+		RICHACE_POSIX_MODE_READ |		\
+		RICHACE_POSIX_MODE_WRITE |		\
+		RICHACE_POSIX_MODE_EXEC)
+/*
+ * These permissions are always allowed
+ * no matter what the acl says.
+ */
+#define RICHACE_POSIX_ALWAYS_ALLOWED (	\
+		RICHACE_SYNCHRONIZE |	\
+		RICHACE_READ_ATTRIBUTES |	\
+		RICHACE_READ_ACL)
+/*
+ * The owner is implicitly granted
+ * these permissions under POSIX.
+ */
+#define RICHACE_POSIX_OWNER_ALLOWED (		\
+		RICHACE_WRITE_ATTRIBUTES |		\
+		RICHACE_WRITE_OWNER |		\
+		RICHACE_WRITE_ACL)
 /**
  * richacl_get  -  grab another reference to a richacl handle
  */
@@ -243,5 +286,8 @@ richace_is_same_identifier(const struct richace *a, const struct richace *b)
 
 extern struct richacl *richacl_alloc(int, gfp_t);
 extern struct richacl *richacl_clone(const struct richacl *, gfp_t);
+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);
 
 #endif /* __RICHACL_H */
-- 
2.1.0


  parent reply	other threads:[~2015-04-24 11:17 UTC|newest]

Thread overview: 154+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-24 11:03 [RFC v3 00/45] Richacls Andreas Gruenbacher
2015-04-24 11:03 ` Andreas Gruenbacher
2015-04-24 11:03 ` [RFC v3 01/45] vfs: Minor documentation fix Andreas Gruenbacher
2015-04-24 11:03 ` [RFC v3 02/45] uapi: Remove kernel internal declaration Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 03/45] nfsd: Checking for acl support does not require fetching any acls Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 04/45] vfs: Shrink struct posix_acl Andreas Gruenbacher
2015-04-25  7:56   ` Rasmus Villemoes
2015-04-27 10:27     ` Andreas Grünbacher
2015-04-24 11:04 ` [RFC v3 05/45] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 06/45] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 07/45] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 08/45] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-04-24 11:04   ` Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 09/45] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 10/45] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-04-24 11:04 ` Andreas Gruenbacher [this message]
2015-04-24 11:04 ` [RFC v3 12/45] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-05-12 21:44   ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 13/45] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-04-24 11:04   ` Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 14/45] richacl: Permission check algorithm Andreas Gruenbacher
2015-04-24 11:04   ` Andreas Gruenbacher
2015-05-22 21:08   ` J. Bruce Fields
2015-05-27 11:25     ` Andreas Grünbacher
2015-05-27 15:05       ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 15/45] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 16/45] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 17/45] richacl: Create-time inheritance Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 18/45] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 19/45] richacl: Also recognize nontrivial mode-equivalent acls Andreas Gruenbacher
2015-05-14 19:28   ` J. Bruce Fields
2015-05-15 20:04     ` J. Bruce Fields
2015-05-15 20:04       ` J. Bruce Fields
2015-05-15 20:51   ` J. Bruce Fields
2015-05-15 20:51     ` J. Bruce Fields
2015-05-27  9:24     ` Andreas Grünbacher
2015-05-27 15:06       ` J. Bruce Fields
2015-05-27 15:06         ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 20/45] richacl: Automatic Inheritance Andreas Gruenbacher
2015-05-13 18:01   ` Frank Filz
2015-05-13 18:01     ` Frank Filz
2015-05-13 20:22     ` Andreas Grünbacher
2015-05-13 20:22       ` Andreas Grünbacher
2015-05-13 20:28       ` Jeremy Allison
2015-05-13 20:28         ` Jeremy Allison
2015-05-13 20:47         ` Andreas Grünbacher
2015-05-13 20:47           ` Andreas Grünbacher
2015-05-13 20:55           ` Jeremy Allison
2015-05-13 20:55             ` Jeremy Allison
2015-05-13 21:15             ` Andreas Grünbacher
2015-05-13 21:15               ` Andreas Grünbacher
2015-05-13 20:38       ` Frank Filz
2015-05-13 20:38         ` Frank Filz
2015-05-13 21:05         ` Andreas Grünbacher
2015-05-13 22:56           ` Frank Filz
2015-05-13 22:56             ` Frank Filz
2015-05-13 23:52             ` Andreas Grünbacher
2015-05-14 15:09   ` J. Bruce Fields
2015-05-14 15:09     ` J. Bruce Fields
2015-05-18 20:39     ` Andreas Grünbacher
2015-05-18 20:39       ` Andreas Grünbacher
2015-05-18 20:43       ` J. Bruce Fields
2015-05-18 20:43         ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 21/45] richacl: xattr mapping functions Andreas Gruenbacher
2015-04-24 11:04   ` Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 22/45] vfs: Add richacl permission checking Andreas Gruenbacher
2015-04-24 11:04   ` Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 23/45] ext4: Add richacl support Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 24/45] ext4: Add richacl feature flag Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 25/45] richacl: acl editing helper functions Andreas Gruenbacher
2015-04-24 11:04   ` Andreas Gruenbacher
2015-05-15 21:33   ` J. Bruce Fields
2015-05-15 21:33     ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 26/45] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-05-18 21:20   ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 27/45] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 28/45] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 29/45] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-05-26 21:56   ` J. Bruce Fields
2015-05-26 21:56     ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 30/45] richacl: Create richacl from mode values Andreas Gruenbacher
2015-05-28 19:24   ` J. Bruce Fields
2015-05-28 19:24     ` J. Bruce Fields
2015-05-28 19:25     ` J. Bruce Fields
2015-05-28 19:58       ` Andreas Grünbacher
2015-05-28 19:58         ` Andreas Grünbacher
2015-04-24 11:04 ` [RFC v3 31/45] richacl: Create acl with masks applied in richacl_from_mode() Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 32/45] nfsd: Remove dead declarations Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 33/45] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-05-28 19:52   ` J. Bruce Fields
2015-05-28 19:52     ` J. Bruce Fields
2015-05-28 20:28     ` Andreas Grünbacher
2015-05-28 20:28       ` Andreas Grünbacher
2015-04-24 11:04 ` [RFC v3 34/45] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 35/45] nfsd: Add richacl support Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 36/45] NFSv4: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-05-28 20:33   ` J. Bruce Fields
2015-05-28 20:33     ` J. Bruce Fields
2015-05-28 20:50     ` Trond Myklebust
2015-05-28 20:50       ` Trond Myklebust
2015-05-28 21:05       ` Andreas Grünbacher
2015-05-28 21:05         ` Andreas Grünbacher
2015-05-28 21:40         ` Trond Myklebust
2015-05-28 21:40           ` Trond Myklebust
2015-05-28 21:55           ` Trond Myklebust
2015-05-28 21:55             ` Trond Myklebust
2015-05-28 22:09             ` Andreas Grünbacher
2015-05-28 22:09               ` Andreas Grünbacher
2015-05-28 22:24               ` Trond Myklebust
2015-05-28 22:24                 ` Trond Myklebust
2015-05-28 22:28                 ` Andreas Grünbacher
2015-05-28 21:15     ` Andreas Grünbacher
2015-05-28 21:28     ` Andreas Grünbacher
2015-05-28 21:28       ` Andreas Grünbacher
2015-04-24 11:04 ` [RFC v3 37/45] nfs/sunrpc: No more encode and decode function pointer casting Andreas Gruenbacher
2015-05-28 23:11   ` Trond Myklebust
2015-05-28 23:40     ` Andreas Grünbacher
2015-05-29  0:37       ` Trond Myklebust
2015-05-29  0:37         ` Trond Myklebust
2015-05-29 15:30         ` Andreas Grünbacher
2015-05-29 15:30           ` Andreas Grünbacher
2015-04-24 11:04 ` [RFC v3 38/45] nfs/sunrpc: Return status code from encode functions Andreas Gruenbacher
2015-05-28 23:39   ` Trond Myklebust
2015-05-28 23:39     ` Trond Myklebust
2015-04-24 11:04 ` [RFC v3 39/45] nfs3: Return posix acl encode errors Andreas Gruenbacher
2015-04-24 11:04   ` Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 40/45] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 41/45] rpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-05-28 23:24   ` Trond Myklebust
2015-05-28 23:24     ` Trond Myklebust
2015-05-29 15:46     ` Andreas Grünbacher
2015-04-24 11:04 ` [RFC v3 42/45] nfs: Add richacl support Andreas Gruenbacher
2015-05-28 23:06   ` Trond Myklebust
2015-05-28 23:29     ` Andreas Grünbacher
2015-05-29 13:15     ` Trond Myklebust
2015-05-29 15:00       ` Andreas Grünbacher
2015-05-29 15:24         ` Trond Myklebust
2015-05-29 15:45           ` Andreas Grünbacher
2015-05-29 15:54             ` Trond Myklebust
2015-05-29 15:54               ` Trond Myklebust
2015-05-29 15:54           ` Frank Filz
2015-05-29 15:54             ` Frank Filz
2016-06-23 16:37   ` Weston Andros Adamson
2016-06-23 17:15     ` Frank Filz
2016-07-15  8:00     ` Andreas Grünbacher
2015-04-24 11:04 ` [RFC v3 43/45] uapi/nfs: Add NFSv4.1 ACL definitions Andreas Gruenbacher
2015-05-29 14:57   ` J. Bruce Fields
2015-04-24 11:04 ` [RFC v3 44/45] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-04-24 11:04 ` [RFC v3 45/45] nfs: " Andreas Gruenbacher
2015-05-23 15:50 ` [RFC v3 00/45] Richacls Jeremy Allison
2015-05-23 15:50   ` Jeremy Allison
2015-05-23 15:56   ` Andreas Grünbacher
2015-05-23 15:56     ` Andreas Grünbacher
2015-06-25 20:03   ` Stefan (metze) Metzmacher

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=3c47aff8235025acfc8df84e354a799a4159a048.1429868795.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 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.