From patchwork Wed Jul 22 13:03:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Gr=C3=BCnbacher?= X-Patchwork-Id: 6843251 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 34F039F380 for ; Wed, 22 Jul 2015 13:13:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DD6D206D4 for ; Wed, 22 Jul 2015 13:13:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36520206CE for ; Wed, 22 Jul 2015 13:13:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933761AbbGVNNY (ORCPT ); Wed, 22 Jul 2015 09:13:24 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:34193 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756740AbbGVNEd (ORCPT ); Wed, 22 Jul 2015 09:04:33 -0400 Received: by wibud3 with SMTP id ud3so153269770wib.1; Wed, 22 Jul 2015 06:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z/sUhx+1krstmj9NupXLo3HWA6EMiMSLvMIUPhlq4EM=; b=wMekVqjPLlENOf5s5TVWd4AywFYFlCZLqxt4pYE4kBUHvdSghHbvj7MrRDB8E4m/9Z sWbTb3HYKLFRj4KuKcroK1s9u8212PZtARUh3TFBYUIhd34BzOSryDsdnkw12/2xU5Fb iP3HC+xGFBfNpkahS7i9gcYp8IsTMifT/FBL4Hq5XOg7ZIEawh4wbL5seP+ueCCt/uE/ oaqcCynh9cHn+oNwfhHpqrzUZEre+EKakSDI9ns70qzV+H8v5jdKGHIPo/tELnrK/FJB 4egjjxk7y3XKhJRMYToiItDEDzJ0BH59k28HuNfie+sfLvnWpJMtjtHAz0ixjGn2q5YU dcMw== X-Received: by 10.180.218.195 with SMTP id pi3mr6154494wic.71.1437570272001; Wed, 22 Jul 2015 06:04:32 -0700 (PDT) Received: from schleppi.home.com ([149.14.88.26]) by smtp.gmail.com with ESMTPSA id u7sm21992628wif.3.2015.07.22.06.04.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 06:04:31 -0700 (PDT) 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 23/39] richacl: Set the owner permissions to the owner mask Date: Wed, 22 Jul 2015 15:03:13 +0200 Message-Id: <1437570209-29832-24-git-send-email-andreas.gruenbacher@gmail.com> X-Mailer: git-send-email 2.4.3 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 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andreas Gruenbacher Change the acl so that owner@ is granted the permissions set in the owner mask. Signed-off-by: Andreas Gruenbacher --- fs/richacl_compat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/fs/richacl_compat.c b/fs/richacl_compat.c index b709cde..db33b63 100644 --- a/fs/richacl_compat.c +++ b/fs/richacl_compat.c @@ -399,3 +399,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; +}