From patchwork Wed Sep 23 01:39:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 7246921 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 297F69F380 for ; Wed, 23 Sep 2015 01:40:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4285F20A40 for ; Wed, 23 Sep 2015 01:40:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EAF920A3D for ; Wed, 23 Sep 2015 01:40:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759947AbbIWBjz (ORCPT ); Tue, 22 Sep 2015 21:39:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59275 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752217AbbIWBjy (ORCPT ); Tue, 22 Sep 2015 21:39:54 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id ED476461E2; Wed, 23 Sep 2015 01:39:53 +0000 (UTC) Received: from nuc.home.com (vpn1-4-53.ams2.redhat.com [10.36.4.53]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8N1dn69011494; Tue, 22 Sep 2015 21:39:50 -0400 From: Andreas Gruenbacher To: "J. Bruce Fields" Cc: linux-kernel@vger.kernel.org, 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 Subject: Re: [RFC v7 22/41] richacl: Propagate everyone@ permissions to other aces Date: Wed, 23 Sep 2015 03:39:44 +0200 Message-Id: <1442972384-22757-1-git-send-email-agruenba@redhat.com> In-Reply-To: References: <1441448856-13478-1-git-send-email-agruenba@redhat.com> <1441448856-13478-23-git-send-email-agruenba@redhat.com> <20150918215611.GD22671@fieldses.org> <20150921192441.GA12968@fieldses.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, 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 Here are my improvements; hope that helps ... Thanks, Andreas diff --git a/fs/richacl_compat.c b/fs/richacl_compat.c index 9b76fc0..21af9a0 100644 --- a/fs/richacl_compat.c +++ b/fs/richacl_compat.c @@ -351,26 +351,26 @@ richacl_propagate_everyone(struct richacl_alloc *alloc) struct richace *ace; unsigned int owner_allow, group_allow; - /* - * If the owner mask contains permissions which are not in the group - * mask, the group mask contains permissions which are not in the other - * mask, or the owner class contains permissions which are not in the - * other mask, we may need to propagate permissions up from the - * everyone@ allow ace. The third condition is implied by the first - * two. - */ - if (!((acl->a_owner_mask & ~acl->a_group_mask) || - (acl->a_group_mask & ~acl->a_other_mask))) - return 0; if (!acl->a_count) return 0; ace = acl->a_entries + acl->a_count - 1; if (richace_is_inherit_only(ace) || !richace_is_everyone(ace)) return 0; + /* + * Permissions the owner and group class are granted through the + * trailing everyone@ allow ace. + */ owner_allow = ace->e_mask & acl->a_owner_mask; group_allow = ace->e_mask & acl->a_group_mask; + /* + * If the group or other masks hide permissions which the owner should + * be allowed, we need to propagate those permissions up. Otherwise, + * those permissions may be lost when applying the other mask to the + * trailing everyone@ allow ace, or when isolating the group class from + * the other class through additional deny aces. + */ if (owner_allow & ~(acl->a_group_mask & acl->a_other_mask)) { /* Propagate everyone@ permissions through to owner@. */ who.e_id.special = RICHACE_OWNER_SPECIAL_ID; @@ -379,6 +379,11 @@ richacl_propagate_everyone(struct richacl_alloc *alloc) acl = alloc->acl; } + /* + * If the other mask hides permissions which the group class should be + * allowed, we need to propagate those permissions up to the owning + * group and to all other members in the group class. + */ if (group_allow & ~acl->a_other_mask) { int n; @@ -399,16 +404,15 @@ richacl_propagate_everyone(struct richacl_alloc *alloc) richace_is_owner(ace) || richace_is_group(ace)) continue; - if (richace_is_allow(ace) || richace_is_deny(ace)) { - /* - * Any inserted entry will end up below the - * current entry - */ - if (__richacl_propagate_everyone(alloc, ace, - group_allow)) - return -1; - acl = alloc->acl; - } + + /* + * Any inserted entry will end up below the current + * entry. + */ + if (__richacl_propagate_everyone(alloc, ace, + group_allow)) + return -1; + acl = alloc->acl; } } return 0;