From patchwork Wed Jun 24 21:57: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: 6670261 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 83AC59F39B for ; Wed, 24 Jun 2015 21:58:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF96E20532 for ; Wed, 24 Jun 2015 21:58:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8C372052F for ; Wed, 24 Jun 2015 21:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752709AbbFXV6l (ORCPT ); Wed, 24 Jun 2015 17:58:41 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:36951 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbbFXV6H (ORCPT ); Wed, 24 Jun 2015 17:58:07 -0400 Received: by wicgi11 with SMTP id gi11so58839668wic.0; Wed, 24 Jun 2015 14:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=mKpanuntUfDOWlTYVylvkPN4GG1blnwfzb7qiLOY1xk=; b=VIjuMysGJGuPUaBsPVYeG95m1VPSF03U93991u33JMk66TuM+F6S1qVzXfqPe+3Gcw iBeFRdfzouoWszMYCeToj/cMuPgxFmxZTRrBj/YITVqhVkruosr+y5W9wd3K7QRKlmHa 5pp866gT43ZyLDmeoXzX2PY/DDqJj2ptsWqA5QLaURyPgE6C4IVDb5HB6KJiCyUVWWOO cTcqQLjwx4PipiJtHKECNd++jdWA4qwDIuV9L+uhrRNInfUD+KFYuAcjVgqduafbOaye /+dLD7eribCMxvdoonU6BluLKi1nFLxpw2LaZF3SX8ACjInNNuVKFAwcy7e6ZZMTsz4t CwWw== X-Received: by 10.180.90.112 with SMTP id bv16mr8521037wib.64.1435183086261; Wed, 24 Jun 2015 14:58:06 -0700 (PDT) Received: from nuc.home.com (80-110-112-232.cgn.dynamic.surfer.at. [80.110.112.232]) by mx.google.com with ESMTPSA id lu5sm42559880wjb.9.2015.06.24.14.58.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2015 14:58:05 -0700 (PDT) From: Andreas Gruenbacher X-Google-Original-From: Andreas Gruenbacher To: linux-kernel@vger.kernel.org, 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 Subject: [RFC v4 24/31] richacl: Set the other permissions to the other mask Date: Wed, 24 Jun 2015 23:57:13 +0200 Message-Id: <1435183040-22726-25-git-send-email-agruenba@redhat.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1435183040-22726-1-git-send-email-agruenba@redhat.com> References: <1435183040-22726-1-git-send-email-agruenba@redhat.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=-5.7 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/fs/richacl_compat.c b/fs/richacl_compat.c index 882c2f1..b699cd3 100644 --- a/fs/richacl_compat.c +++ b/fs/richacl_compat.c @@ -447,3 +447,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; +}