Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1233789
| From | Andreas Gruenbacher <agruenba@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v8 23/41] richacl: Set the owner permissions to the owner mask |
| Date | 2015-09-28 00:30 +0200 |
| Message-ID | <qdsCe-3EH-5@gated-at.bofh.it> (permalink) |
| References | <qdsiR-3hB-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v8 00/41] Richacls Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:10 +0200
[PATCH v8 31/41] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 15/41] richacl: Automatic Inheritance Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 03/41] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 12/41] vfs: Cache richacl in struct inode Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 14/41] richacl: Create-time inheritance Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 33/41] richacl: Add support for unmapped identifiers Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 06/41] richacl: In-memory representation and helper functions Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 09/41] richacl: Update the file masks in chmod() Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
Re: [PATCH v8 09/41] richacl: Update the file masks in chmod() "J. Bruce Fields" <bfields@fieldses.org> - 2015-09-28 17:30 +0200
Re: [PATCH v8 09/41] richacl: Update the file masks in chmod() Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-29 01:50 +0200
[PATCH v8 13/41] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 27/41] richacl: Create richacl from mode values Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 19/41] ext4: Add richacl feature flag Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 21/41] richacl: Move everyone@ aces down the acl Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 20/41] richacl: acl editing helper functions Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 32/41] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 26/41] richacl: Apply the file masks to a richacl Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 01/41] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 41/41] richacl: uapi header split Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 18/41] ext4: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 17/41] vfs: Add richacl permission checking Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 35/41] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 38/41] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 36/41] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 16/41] richacl: xattr mapping functions Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 25/41] richacl: Isolate the owner and group classes Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 40/41] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 11/41] vfs: Cache base_acl objects in inodes Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 08/41] richacl: Compute maximum file masks from an acl Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 34/41] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 05/41] vfs: Add permission flags for setting file attributes Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 28/41] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 04/41] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 22/41] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 37/41] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 29/41] nfsd: Use richacls as internal acl representation Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 39/41] nfs: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:20 +0200
[PATCH v8 24/41] richacl: Set the other permissions to the other mask Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:30 +0200
[PATCH v8 23/41] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:30 +0200
[PATCH v8 30/41] nfsd: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:30 +0200
[PATCH v8 07/41] richacl: Permission mapping functions Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:40 +0200
[PATCH v8 10/41] richacl: Permission check algorithm Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:40 +0200
Re: [PATCH v8 10/41] richacl: Permission check algorithm "J. Bruce Fields" <bfields@fieldses.org> - 2015-09-28 18:10 +0200
Re: [PATCH v8 10/41] richacl: Permission check algorithm Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-09-28 18:30 +0200
Re: [PATCH v8 10/41] richacl: Permission check algorithm "J. Bruce Fields" <bfields@fieldses.org> - 2015-09-28 18:30 +0200
Re: [PATCH v8 10/41] richacl: Permission check algorithm Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-09-28 19:00 +0200
[PATCH v8 02/41] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher <agruenba@redhat.com> - 2015-09-28 00:50 +0200
Re: [PATCH v8 00/41] Richacls "J. Bruce Fields" <bfields@fieldses.org> - 2015-09-28 18:40 +0200
Re: [PATCH v8 00/41] Richacls Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-09-28 19:20 +0200
Re: [PATCH v8 00/41] Richacls "J. Bruce Fields" <bfields@fieldses.org> - 2015-09-28 19:50 +0200
Re: [PATCH v8 00/41] Richacls Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-09-29 17:00 +0200
Re: [PATCH v8 00/41] Richacls Christoph Hellwig <hch@infradead.org> - 2015-10-04 08:30 +0200
Re: [PATCH v8 00/41] Richacls Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-05 20:50 +0200
Re: [PATCH v8 00/41] Richacls Austin S Hemmelgarn <ahferroin7@gmail.com> - 2015-10-05 21:00 +0200
Re: [PATCH v8 00/41] Richacls Dave Chinner <david@fromorbit.com> - 2015-10-05 23:20 +0200
Re: [PATCH v8 00/41] Richacls Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-06 00:10 +0200
csiph-web