From patchwork Tue Aug 4 11:53:22 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: 6937481 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D1F6C05AC for ; Tue, 4 Aug 2015 12:03:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20E4B2034A for ; Tue, 4 Aug 2015 12:03:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29048202E9 for ; Tue, 4 Aug 2015 12:03:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933824AbbHDMDB (ORCPT ); Tue, 4 Aug 2015 08:03:01 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:35973 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933662AbbHDLzX (ORCPT ); Tue, 4 Aug 2015 07:55:23 -0400 Received: by wicgj17 with SMTP id gj17so146767982wic.1; Tue, 04 Aug 2015 04:55:21 -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=8DdIHCgSyk1TLcqtpNd+IRcpRZznIK6wwDZSITCuaNA=; b=p1SwbJyegtK7uJAlzl2RB88LBNbxNdkbv36VfM8VtRxP3EGJbO3gmnEJdow2CKDfbF vHf6MI4NGnfN4oUtfftLC+Hv1pZ+PCo6mwMJrOk7E0x/rgAZMeyY/TNWvTvcoqO/3k2V dA5VivFooc4ldwF/CTVh1M+WCOVWV7XWCVZyhUm3/oNLkG7Zud4P8T5zePpqDtANxG7W BZCc2YabHYYL0r7uLVwiE5EQ2PqY/lV53cT9psje0j3Lsx7vC86VmrIddHfSIAmgKydE 1hYVFt/jnN0g2ygpQX0Y8TvyDTf/bLhibzc7h3px90M/k4Ep+UB0IMA/76UmbZEl3bk1 2GLg== X-Received: by 10.180.97.7 with SMTP id dw7mr44910238wib.74.1438689320962; Tue, 04 Aug 2015 04:55:20 -0700 (PDT) Received: from schleppi.home.com (p54980F84.dip0.t-ipconnect.de. [84.152.15.132]) by smtp.gmail.com with ESMTPSA id u7sm2018458wif.3.2015.08.04.04.55.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Aug 2015 04:55:20 -0700 (PDT) From: Andreas Gruenbacher X-Google-Original-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, linux-cifs@vger.kernel.org, linux-security-module@vger.kernel.org, Andreas Gruenbacher Subject: [RFC v6 24/40] richacl: Set the other permissions to the other mask Date: Tue, 4 Aug 2015 13:53:22 +0200 Message-Id: <1438689218-6921-25-git-send-email-agruenba@redhat.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1438689218-6921-1-git-send-email-agruenba@redhat.com> References: <1438689218-6921-1-git-send-email-agruenba@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Change the acl so that everyone@ is granted the permissions set in the other mask. Signed-off-by: Andreas Gruenbacher --- fs/richacl_compat.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/fs/richacl_compat.c b/fs/richacl_compat.c index 807372d..76d5ab9 100644 --- a/fs/richacl_compat.c +++ b/fs/richacl_compat.c @@ -458,3 +458,38 @@ 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 && + (acl->a_flags & RICHACL_WRITE_THROUGH) && + (acl->a_flags & RICHACL_MASKED))) + 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; +}