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>,
linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-api@vger.kernel.org
Subject: [PATCH v9 25/43] richacl: Set the owner permissions to the owner mask
Date: Mon, 5 Oct 2015 21:36:52 +0200 [thread overview]
Message-ID: <1444073830-21854-26-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1444073830-21854-1-git-send-email-agruenba@redhat.com>
In the write-through case, change the acl so that owner@ is granted the
permissions set in the owner mask (to match what the permission check
algorithm grants the owner).
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: J. Bruce Fields <bfields@redhat.com>
---
fs/richacl_compat.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/fs/richacl_compat.c b/fs/richacl_compat.c
index 7d007d7..16deeb4 100644
--- a/fs/richacl_compat.c
+++ b/fs/richacl_compat.c
@@ -416,3 +416,49 @@ richacl_propagate_everyone(struct richacl_alloc *alloc)
}
return 0;
}
+
+/**
+ * richacl_set_owner_permissions - set the owner permissions to the owner mask
+ *
+ * In the write-through case, change the acl so that owner@ is granted the
+ * permissions set in the owner mask (to match what the permission check
+ * algorithm grants the owner). 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 (!((alloc->acl->a_flags & RICHACL_WRITE_THROUGH)))
+ return 0;
+
+ richacl_for_each_entry(ace, alloc->acl) {
+ if (richace_is_owner(ace)) {
+ if (richace_is_allow(ace) && !(owner_mask & denied)) {
+ richace_change_mask(alloc, &ace, owner_mask);
+ owner_mask = 0;
+ } else
+ 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.5.0
next prev parent reply other threads:[~2015-10-05 19:39 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-05 19:36 [PATCH v9 00/43] Richacls Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 01/43] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 02/43] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 03/43] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 04/43] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 05/43] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 06/43] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 07/43] richacl: Permission mapping functions Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 08/43] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 09/43] richacl: Permission check algorithm Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 10/43] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 11/43] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 12/43] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 13/43] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 14/43] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 15/43] richacl: Create-time inheritance Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 16/43] richacl: Automatic Inheritance Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 17/43] richacl: xattr mapping functions Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 18/43] richacl: Add richacl xattr handler Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 19/43] vfs: Add richacl permission checking Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 20/43] ext4: Add richacl support Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 21/43] ext4: Add richacl feature flag Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 22/43] richacl: acl editing helper functions Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 23/43] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 24/43] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-10-05 19:36 ` Andreas Gruenbacher [this message]
2015-10-05 19:36 ` [PATCH v9 26/43] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 27/43] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 28/43] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 29/43] richacl: Create richacl from mode values Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 30/43] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 31/43] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-10-05 19:36 ` [PATCH v9 32/43] nfsd: Add richacl support Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 33/43] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 34/43] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 35/43] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 36/43] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 37/43] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 38/43] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 39/43] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 40/43] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 41/43] nfs: Add richacl support Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 42/43] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-10-05 19:37 ` [PATCH v9 43/43] richacl: uapi header split Andreas Gruenbacher
2015-10-06 9:07 ` [PATCH v9 00/43] Richacls Pavel Machek
2015-10-06 12:40 ` Andreas Gruenbacher
2015-10-07 7:33 ` James Morris
2015-10-07 13:21 ` Austin S Hemmelgarn
2015-10-07 13:46 ` 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=1444073830-21854-26-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=jlayton@poochiereds.net \
--cc=linux-api@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 \
/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).