From patchwork Wed Jun 24 21:57:12 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: 6670511 Return-Path: X-Original-To: patchwork-linux-nfs@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 AA208C05AC for ; Wed, 24 Jun 2015 22:01:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0DB020569 for ; Wed, 24 Jun 2015 22:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E11E520547 for ; Wed, 24 Jun 2015 22:01:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752671AbbFXV6j (ORCPT ); Wed, 24 Jun 2015 17:58:39 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:36630 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752463AbbFXV6H (ORCPT ); Wed, 24 Jun 2015 17:58:07 -0400 Received: by wguu7 with SMTP id u7so47192886wgu.3; Wed, 24 Jun 2015 14:58:05 -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=x4Y9x7IxQdvMQzWW/iwjDDDbNSWJIcxJnaZo+KgpSTQ=; b=ZykY2Qgafo0sWKekc2oMkQ7ZrdVEQjJErheh9yT7+NK61dF4gRJsdyptpXEklwy8DY KWepqKImwQqo0+5dPuhdLWR251iA8Lt9jHiQgcnqzY5wC2AGq3+lQoQRFkOMSure3+aF 1C75e0pCTolNi9FnL+keBNAr4hw8QlB3dx8b8sJ8FMmOyR8pf8ahYWS8Rd3wQ+6HDFdA cSn6f6eeJEnt60gFqeOU6WyFBOX4YuiGbILGtShMOctptEryKPiCpEcLv8DI6FL5DvoD V5/vS4xAQSQpQXQPs/swg+xsvbTXSUbRlGCCR95fMsrwVxAEg3S1o5DOx4ndlhWII2kg Dkkg== X-Received: by 10.180.79.133 with SMTP id j5mr8717972wix.38.1435183085363; Wed, 24 Jun 2015 14:58:05 -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.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2015 14:58:04 -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 23/31] richacl: Set the owner permissions to the owner mask Date: Wed, 24 Jun 2015 23:57:12 +0200 Message-Id: <1435183040-22726-24-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 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 c6db72a..882c2f1 100644 --- a/fs/richacl_compat.c +++ b/fs/richacl_compat.c @@ -405,3 +405,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; +}