From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4AB6C433FE for ; Mon, 17 Oct 2022 10:06:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231247AbiJQKGq (ORCPT ); Mon, 17 Oct 2022 06:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231387AbiJQKGg (ORCPT ); Mon, 17 Oct 2022 06:06:36 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E63602B197; Mon, 17 Oct 2022 03:06:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 95DBBB81200; Mon, 17 Oct 2022 10:06:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F789C4347C; Mon, 17 Oct 2022 10:06:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666001187; bh=3NZqz0FD3fV11fuAj9/W1BZpYm7w8MUaoDVzm1T/qlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FyZo8KXHJKz6D7zevr7WgPMpCpcKx6Tc0RIHLdnxiK0121lPm6rjuUuEvtIJRgk4F 2NmolF3Nngcm4PMZiDjfhYZLfoFPaUfytUUbV6KPUNgZKD0kLeBoRbizjsQIbg67se 86VT5dLU5q757/mJh9Iizmehu2MFDQ/jO8c5c7FuETFqxxF2vFIqLhuiKwnTT882dG xf9y4sgMQ5fSiD25j3HDUFSQ3BO6l/melYAgwe2XVIYdN+QVB8pzi3x3/gTv7Zz2IM Qk0h31VncRTZQgBSXDUVjZvd3wZtWxNSoi+MIMgNvE+ISnaprNY90xfQ362UhJIVlQ 8ZqaU4my4sgQg== From: Christian Brauner To: Amir Goldstein , Miklos Szeredi , "Darrick J . Wong" Cc: Al Viro , Christoph Hellwig , Seth Forshee , Yang Xu , Filipe Manana , Christian Brauner , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Miklos Szeredi Subject: [PATCH v3 4/5] ovl: remove privs in ovl_copyfile() Date: Mon, 17 Oct 2022 12:05:59 +0200 Message-Id: <20221017100600.70269-5-brauner@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221017100600.70269-1-brauner@kernel.org> References: <20221017100600.70269-1-brauner@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1512; i=brauner@kernel.org; h=from:subject; bh=cwT4vtYTlyq8yS5QPd3agV4tcMGPkrOBxv4nXizKaXs=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMST7avz+2FY99ZhVy46F83suxuT0bBHzyC2r3eW/4+28/v2m L3oVOkpZGMS4GGTFFFkc2k3C5ZbzVGw2ytSAmcPKBDKEgYtTACZyeQbDXwFW6alX1ip3dzY8mGb/ct HeGZaCST2vX/91TFI8xP/PeiPDfy9TpsB9y94XF9n2OlVXvDi/pMZ/VtfkScmrBJU3v/pwmAEA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Amir Goldstein Underlying fs doesn't remove privs because copy_range/remap_range are called with privileged mounter credentials. This fixes some failures in fstest generic/673. Fixes: 8ede205541ff ("ovl: add reflink/copyfile/dedup support") Signed-off-by: Amir Goldstein Acked-by: Miklos Szeredi --- Notes: /* v2 */ Acked-by: Miklos Szeredi /* v3 */ unchanged fs/overlayfs/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index a1a22f58ba18..755a11c63596 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -567,14 +567,23 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, const struct cred *old_cred; loff_t ret; + inode_lock(inode_out); + if (op != OVL_DEDUPE) { + /* Update mode */ + ovl_copyattr(inode_out); + ret = file_remove_privs(file_out); + if (ret) + goto out_unlock; + } + ret = ovl_real_fdget(file_out, &real_out); if (ret) - return ret; + goto out_unlock; ret = ovl_real_fdget(file_in, &real_in); if (ret) { fdput(real_out); - return ret; + goto out_unlock; } old_cred = ovl_override_creds(file_inode(file_out)->i_sb); @@ -603,6 +612,9 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, fdput(real_in); fdput(real_out); +out_unlock: + inode_unlock(inode_out); + return ret; } -- 2.34.1