Return-Path: Received: from mail-wi0-f180.google.com ([209.85.212.180]:38557 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756866AbbGVNEe (ORCPT ); Wed, 22 Jul 2015 09:04:34 -0400 From: Andreas Gruenbacher 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 Subject: [PATCH v5 24/39] richacl: Set the other permissions to the other mask Date: Wed, 22 Jul 2015 15:03:14 +0200 Message-Id: <1437570209-29832-25-git-send-email-andreas.gruenbacher@gmail.com> In-Reply-To: <1437570209-29832-1-git-send-email-andreas.gruenbacher@gmail.com> References: <1437570209-29832-1-git-send-email-andreas.gruenbacher@gmail.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andreas Gruenbacher Change the acl so that everyone@ is granted the permissions set in the other mask. Signed-off-by: Andreas Gruenbacher --- fs/richacl_compat.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/fs/richacl_compat.c b/fs/richacl_compat.c index db33b63..438859c 100644 --- a/fs/richacl_compat.c +++ b/fs/richacl_compat.c @@ -441,3 +441,36 @@ richacl_set_owner_permissions(struct richacl_alloc *alloc) } return 0; } + +/** + * richacl_set_other_permissions - set the other permissions to the other mask + * + * Change the acl so that everyone@ is granted the permissions set in the other + * mask. This leaves at most one efective everyone@ allow entry at the end of + * the acl. + */ +static int +richacl_set_other_permissions(struct richacl_alloc *alloc) +{ + struct richacl *acl = alloc->acl; + unsigned int x = RICHACE_POSIX_ALWAYS_ALLOWED; + unsigned int other_mask = acl->a_other_mask & ~x; + struct richace *ace = acl->a_entries + acl->a_count - 1; + + if (!other_mask) + return 0; + + if (acl->a_count == 0 || + !richace_is_everyone(ace) || + richace_is_inherit_only(ace)) { + ace++; + 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 = other_mask; + ace->e_id.special = RICHACE_EVERYONE_SPECIAL_ID; + } else + richace_change_mask(alloc, &ace, other_mask); + return 0; +} -- 2.4.3