From patchwork Wed Oct 26 18:30:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9398019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95C1D600BA for ; Wed, 26 Oct 2016 18:30:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B8BB29C54 for ; Wed, 26 Oct 2016 18:30:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E92E29C5F; Wed, 26 Oct 2016 18:30:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F62329C54 for ; Wed, 26 Oct 2016 18:30:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756859AbcJZSas (ORCPT ); Wed, 26 Oct 2016 14:30:48 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36842 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753643AbcJZSar (ORCPT ); Wed, 26 Oct 2016 14:30:47 -0400 Received: by mail-wm0-f65.google.com with SMTP id c17so1743240wmc.3; Wed, 26 Oct 2016 11:30:46 -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=+fCkj77jffPvewPAg49qS63jebp/rl2t8hwRCuR0UZA=; b=P7gR49DsjPmnQs0hdSHUs9hgM7hQGhZVXlk4HS0EYI87Tl7wsY7j0c4SV61sk+A+o7 Acqx4a8xIGEwTucIyYNw2fRgfQMkFE7RCyeexNK8MgNTO7DMQoQ/Y+f/9JzfyznHY9OI TnFjerZwmjmj3rYG0d7FwbUj+uZch3Brv2f5bCZb9kQeiiJ39SVIa0QkbypFizVTnl4Z RzSrOXT8ypdZ05Vxsca7QhxVCOPq+iTDX79tiAFiJGoAkUBfwCPohQD8pZ3VneGT87IX wIxxi9ww3TX+BKSF+lw0Axl63Y3Ogw/2RrLplMFm3FnoNLhaginBDXnC68gyiBls972V vfRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+fCkj77jffPvewPAg49qS63jebp/rl2t8hwRCuR0UZA=; b=feoY+WONaCCVsXYbeAEyXFAFZos2eZPtfKqTQgLJEFTcH16drJroRp0nCT6mqcXxsg CBJXNSeOgQy3cVexGsef2L75rxeujdVPJzH8AuvXBhrogAjcMU9xM23WsvPGBirTm+pq 09fKPoNAxXJntfW9DlkafS6/cYITc4FWLnAy/RXx1WW3XNErZepBw/ek3lY+nlyCWVFe 85t5LZngER4FP5PhGIcMG2RQNm8gsLbWW5ahrcI1VodggK+QPWxX6QtKUeoCQUPgW/AI pN78dE3wmDRm4c4Sa5dYctFX8h4OSluYfUook5VpKFGQDDekb6zghj/jCY1Ugi9G61FV sgcw== X-Gm-Message-State: ABUngvfUtdzZL7H4p0xXavrtDfOPkR26F6QkZE1Ko4hYqKtaZJhSFzWK+iX3fX3uhqwBPA== X-Received: by 10.194.68.38 with SMTP id s6mr3426334wjt.130.1477506645932; Wed, 26 Oct 2016 11:30:45 -0700 (PDT) Received: from amir-VirtualBox.Home (bzq-79-177-34-153.red.bezeqint.net. [79.177.34.153]) by smtp.gmail.com with ESMTPSA id n6sm3995561wjg.30.2016.10.26.11.30.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Oct 2016 11:30:44 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Vivek Goyal , Andreas Gruenbacher , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2] ovl: update S_ISGID when setting posix ACLs Date: Wed, 26 Oct 2016 21:30:16 +0300 Message-Id: <1477506616-14061-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477501840-25066-1-git-send-email-amir73il@gmail.com> References: <1477501840-25066-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since operations on upper are performed using mounter's credentials, we need to call posix_acl_update_mode() with current credentials on overlay inode to possibly copy-up and clear setgid bit, before setting posix ACLs on upper inode. Also wrap posix acl handlers with #ifdef CONFIG_FS_POSIX_ACL to avoid compiler warning for implicit declaration of function 'posix_acl_update_mode' on build without that config option. This change fixes xfstest generic/375, which failed to clear the setgid bit in the following test case over overlayfs: touch $testfile chown 100:100 $testfile chmod 2755 $testfile _runas -u 100 -g 101 -- setfacl -m u::rwx,g::rwx,o::rwx $testfile Signed-off-by: Amir Goldstein --- fs/overlayfs/super.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 30263a5..7071790 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -523,6 +523,22 @@ static unsigned int ovl_split_lowerdirs(char *str) } static int __maybe_unused +ovl_set_mode(struct dentry *dentry, umode_t mode) +{ + struct iattr iattr; + + if (mode == d_inode(dentry)->i_mode) + return 0; + + iattr.ia_valid = ATTR_MODE | ATTR_CTIME; + iattr.ia_mode = mode; + iattr.ia_ctime = current_time(d_inode(dentry)); + + return ovl_setattr(dentry, &iattr); +} + +#ifdef CONFIG_FS_POSIX_ACL +static int __maybe_unused ovl_posix_acl_xattr_get(const struct xattr_handler *handler, struct dentry *dentry, struct inode *inode, const char *name, void *buffer, size_t size) @@ -560,6 +576,18 @@ ovl_posix_acl_xattr_set(const struct xattr_handler *handler, if (!inode_owner_or_capable(inode)) goto out_acl_release; + if (handler->flags == ACL_TYPE_ACCESS) { + umode_t mode; + struct posix_acl *newacl = acl; + + err = posix_acl_update_mode(inode, &mode, &newacl); + if (err) + goto out_acl_release; + err = ovl_set_mode(dentry, mode); + if (err) + goto out_acl_release; + } + posix_acl_release(acl); err = ovl_xattr_set(dentry, handler->name, value, size, flags); @@ -572,6 +600,7 @@ ovl_posix_acl_xattr_set(const struct xattr_handler *handler, posix_acl_release(acl); return err; } +#endif static int ovl_own_xattr_get(const struct xattr_handler *handler, struct dentry *dentry, struct inode *inode, @@ -603,6 +632,7 @@ static int ovl_other_xattr_set(const struct xattr_handler *handler, return ovl_xattr_set(dentry, name, value, size, flags); } +#ifdef CONFIG_FS_POSIX_ACL static const struct xattr_handler __maybe_unused ovl_posix_acl_access_xattr_handler = { .name = XATTR_NAME_POSIX_ACL_ACCESS, @@ -618,6 +648,7 @@ ovl_posix_acl_default_xattr_handler = { .get = ovl_posix_acl_xattr_get, .set = ovl_posix_acl_xattr_set, }; +#endif static const struct xattr_handler ovl_own_xattr_handler = { .prefix = OVL_XATTR_PREFIX,