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 E1445C4321E for ; Mon, 17 Oct 2022 10:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230406AbiJQKGp (ORCPT ); Mon, 17 Oct 2022 06:06:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231351AbiJQKGg (ORCPT ); Mon, 17 Oct 2022 06:06:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 607855F7E2; Mon, 17 Oct 2022 03:06:31 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 2955E6100B; Mon, 17 Oct 2022 10:06:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB704C43146; Mon, 17 Oct 2022 10:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666001190; bh=8+pm1Gyok99ypGEogBIk14qQkX8CSGRb7U5My8BNvzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AzCj2+gNR1P+t28OAb3Nu/nwJ4Q0PH+ztE2XpdITQJ6mSXiSUSAY0Z1ldT39BeDfE TTVI4CUptT3tJYpdY94f5muSr8n36HeB/pvi9gYGT7qG9QpwUiNCV9Etur9ccbJOyp GR5yBucqiq0CBvW1tDY2SABZ4RiR4qTNVq9tzSUrG7he9bCGZuAvt2+q/1hE+d67oN QCqMg84v2PVhP+hDEtZ6EVIt7VaAfSuY2bhMz9s5a4Htmp3WuLmThCRhgWfPK3aGop dXEZdilf2bZCHgwUipyEZsC8C5tJIlafsK/9seKXIoqkoWeq4ZDTPiwlNEpMvK6phk rK8dm1uiHk0KQ== 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 5/5] ovl: remove privs in ovl_fallocate() Date: Mon, 17 Oct 2022 12:06:00 +0200 Message-Id: <20221017100600.70269-6-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=1358; i=brauner@kernel.org; h=from:subject; bh=K5sAcB0+cO0LiB6mZF1v9GKE2/+4csaj3McCkOWmEbs=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMST7avxeuOjzHUX7/Jy+2pWFFjwdDNXsz9ueH7n35UVUmd7X 41e0OkpZGMS4GGTFFFkc2k3C5ZbzVGw2ytSAmcPKBDKEgYtTACbCcoqR4buwTLr9VsnuzRLeti8fLb l1zDFeoeFJbKHaygOzPxpr8jD8T1rT85Yp+bqRVduW3//NZVr9JfYUM+1wLxI53vuYofQ0EwA= 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 fallocate is called with privileged mounter credentials. This fixes some failure in fstests generic/683..687. Fixes: aab8848cee5e ("ovl: add ovl_fallocate()") Signed-off-by: Amir Goldstein Acked-by: Miklos Szeredi --- Notes: /* v2 */ Acked-by: Miklos Szeredi /* v3 */ unchanged fs/overlayfs/file.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 755a11c63596..d066be3b9226 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -517,9 +517,16 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len const struct cred *old_cred; int ret; + inode_lock(inode); + /* Update mode */ + ovl_copyattr(inode); + ret = file_remove_privs(file); + if (ret) + goto out_unlock; + ret = ovl_real_fdget(file, &real); if (ret) - return ret; + goto out_unlock; old_cred = ovl_override_creds(file_inode(file)->i_sb); ret = vfs_fallocate(real.file, mode, offset, len); @@ -530,6 +537,9 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len fdput(real); +out_unlock: + inode_unlock(inode); + return ret; } -- 2.34.1