linux-fsdevel.vger.kernel.org archive mirror
 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, linux-api@vger.kernel.org,
	samba-technical@lists.samba.org,
	linux-security-module@vger.kernel.org
Subject: [RFC v4 23/31] richacl: Set the owner permissions to the owner mask
Date: Wed, 24 Jun 2015 23:57:12 +0200	[thread overview]
Message-ID: <1435183040-22726-24-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1435183040-22726-1-git-send-email-agruenba@redhat.com>

Change the acl so that owner@ is granted the permissions set in the owner mask.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 fs/richacl_compat.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/fs/richacl_compat.c b/fs/richacl_compat.c
index c6db72a..882c2f1 100644
--- a/fs/richacl_compat.c
+++ b/fs/richacl_compat.c
@@ -405,3 +405,45 @@ richacl_propagate_everyone(struct richacl_alloc *alloc)
 	}
 	return 0;
 }
+
+/**
+ * richacl_set_owner_permissions  -  set the owner permissions to the owner mask
+ *
+ * Change the acl so that owner@ is granted the permissions set in the owner
+ * mask.  This leaves at most one efective owner@ allow entry at the beginning
+ * of the acl.
+ */
+static int
+richacl_set_owner_permissions(struct richacl_alloc *alloc)
+{
+	unsigned int x = RICHACE_POSIX_ALWAYS_ALLOWED;
+	unsigned int owner_mask = alloc->acl->a_owner_mask & ~x;
+	unsigned int denied = 0;
+	struct richace *ace;
+
+	if (!owner_mask)
+		return 0;
+
+	richacl_for_each_entry(ace, alloc->acl) {
+		if (richace_is_owner(ace)) {
+			if (!richace_is_inherit_only(ace))
+				richace_change_mask(alloc, &ace, 0);
+		} else {
+			if (richace_is_deny(ace))
+				denied |= ace->e_mask;
+		}
+	}
+
+	if (owner_mask & (denied |
+			  ~alloc->acl->a_other_mask |
+			  ~alloc->acl->a_group_mask)) {
+		ace = alloc->acl->a_entries;
+		if (richacl_insert_entry(alloc, &ace))
+			return -1;
+		ace->e_type = RICHACE_ACCESS_ALLOWED_ACE_TYPE;
+		ace->e_flags = RICHACE_SPECIAL_WHO;
+		ace->e_mask = owner_mask;
+		ace->e_id.special = RICHACE_OWNER_SPECIAL_ID;
+	}
+	return 0;
+}
-- 
2.4.2

  parent reply	other threads:[~2015-06-24 21:57 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-24 21:56 [RFC v4 00/31] Richacls Andreas Gruenbacher
2015-06-24 21:56 ` [RFC v4 01/31] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-06-24 21:56 ` [RFC v4 04/31] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-06-24 21:56 ` [RFC v4 05/31] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-06-24 21:56 ` [RFC v4 06/31] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-06-25 19:58   ` Stefan (metze) Metzmacher
2015-06-25 21:06     ` Andreas Grünbacher
     [not found]       ` <CAHpGcM+AwRubQqX96V3WbwLKXKTfk3YcgFG_eqG6r7cVbCTV-w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-06-25 21:40         ` Stefan (metze) Metzmacher
     [not found]           ` <558C7535.9050502-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2015-06-26  7:55             ` Andreas Grünbacher
2015-06-24 21:56 ` [RFC v4 07/31] richacl: Permission mapping functions Andreas Gruenbacher
2015-06-24 21:56 ` [RFC v4 08/31] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 11/31] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 14/31] richacl: Create-time inheritance Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 15/31] richacl: Automatic Inheritance Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 17/31] vfs: Add richacl permission checking Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 19/31] ext4: Add richacl feature flag Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 20/31] richacl: acl editing helper functions Andreas Gruenbacher
2015-06-24 21:57 ` Andreas Gruenbacher [this message]
2015-06-24 21:57 ` [RFC v4 25/31] richacl: Isolate the owner and group classes Andreas Gruenbacher
     [not found] ` <1435183040-22726-1-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-06-24 21:56   ` [RFC v4 02/31] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-06-24 21:56   ` [RFC v4 03/31] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-06-24 21:56   ` [RFC v4 09/31] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-06-24 21:56   ` [RFC v4 10/31] richacl: Permission check algorithm Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 12/31] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 13/31] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 16/31] richacl: xattr mapping functions Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 18/31] ext4: Add richacl support Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 21/31] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 22/31] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 24/31] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 26/31] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 27/31] richacl: Create richacl from mode values Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 28/31] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-06-24 21:57   ` [RFC v4 31/31] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 29/31] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-06-24 21:57 ` [RFC v4 30/31] nfsd: Add richacl support 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=1435183040-22726-24-git-send-email-agruenba@redhat.com \
    --to=andreas.gruenbacher@gmail.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 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).