From patchwork Thu Apr 7 11:21:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 12805089 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 162FFC433EF for ; Thu, 7 Apr 2022 11:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244750AbiDGLYa (ORCPT ); Thu, 7 Apr 2022 07:24:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244740AbiDGLY1 (ORCPT ); Thu, 7 Apr 2022 07:24:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82DA56E8D2; Thu, 7 Apr 2022 04:22:28 -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 1830A61CF0; Thu, 7 Apr 2022 11:22:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DD77C385A0; Thu, 7 Apr 2022 11:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649330547; bh=3SB3NHl1PuAXJFmpwSTU6c82ytSgfL6twncwZKuVsLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JcXVARvMW6cm3/E4vvW5yXRVKux8kASyP20uPZbyKxQ6dbXfnWJ3xEwQq5kdN6l2y d9v9pm2XvzmZiC4oHO73kEZ3fvvqe7wAYvgrloTHcSCYvnKt+GL81iIqBVMy1806Ke 6hXZKYLbWDoxrtebli6AeVoJPD3IKBkome7GGe5NQ5xZTdIUDcUCpOq8lbewhQ6g5a zXAE2BY3L8MjFhJiD6GaLyOHduy22Tx7FO+viAH1yq9/0paSsZQzWDlUK7CiGGIMTg LayYwJ0BAVUGgTx7DsW1Da0f4uE7u44rl+5vZy9Ukb/NboVq2b0BYI4+O8FBaoW/5i G26gWp9BAc6kw== From: Christian Brauner To: Amir Goldstein , Christoph Hellwig , Miklos Szeredi , Al Viro Cc: Christian Brauner , linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org, Aleksa Sarai , Giuseppe Scrivano , Rodrigo Campos Catelin , Seth Forshee , Luca Bocassi , Lennart Poettering , =?utf-8?q?St=C3=A9phane_Graber?= , stable@vger.kernel.org Subject: [PATCH v5 02/19] exportfs: support idmapped mounts Date: Thu, 7 Apr 2022 13:21:39 +0200 Message-Id: <20220407112157.1775081-3-brauner@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220407112157.1775081-1-brauner@kernel.org> References: <20220407112157.1775081-1-brauner@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1973; h=from:subject; bh=3SB3NHl1PuAXJFmpwSTU6c82ytSgfL6twncwZKuVsLM=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMST5nfR0zv4T2/5vedIlYY7D0uXFW81+ygcfyq1SSjo4k3HJ 6XyxjlIWBjEuBlkxRRaHdpNwueU8FZuNMjVg5rAygQxh4OIUgIlk3WL4H1ehLXP9aNeP/Vanrq/Uu7 qAd7LRZYekl1316+0CPl08Y8PIcLDnW+D7psVrtjtpLTI89t2q4Q3/n85vj249f3RN08dzHjsA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Make the two locations where exportfs helpers check permission to lookup a given inode idmapped mount aware by switching it to the lookup_one() helper. This is a bugfix for the open_by_handle_at() system call which doesn't take idmapped mounts into account currently. It's not tied to a specific commit so we'll just Cc stable. In addition this is required to support idmapped base layers in overlay. The overlay filesystem uses exportfs to encode and decode file handles for its index=on mount option and when nfs_export=on. Cc: Cc: Tested-by: Giuseppe Scrivano Reviewed-by: Amir Goldstein Reviewed-by: Christoph Hellwig Signed-off-by: Christian Brauner (Microsoft) --- /* v2 */ unchanged /* v3 */ unchanged /* v4 */ unchanged /* v5 */ unchanged --- fs/exportfs/expfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 0106eba46d5a..3ef80d000e13 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c @@ -145,7 +145,7 @@ static struct dentry *reconnect_one(struct vfsmount *mnt, if (err) goto out_err; dprintk("%s: found name: %s\n", __func__, nbuf); - tmp = lookup_one_len_unlocked(nbuf, parent, strlen(nbuf)); + tmp = lookup_one_unlocked(mnt_user_ns(mnt), nbuf, parent, strlen(nbuf)); if (IS_ERR(tmp)) { dprintk("%s: lookup failed: %d\n", __func__, PTR_ERR(tmp)); err = PTR_ERR(tmp); @@ -525,7 +525,8 @@ exportfs_decode_fh_raw(struct vfsmount *mnt, struct fid *fid, int fh_len, } inode_lock(target_dir->d_inode); - nresult = lookup_one_len(nbuf, target_dir, strlen(nbuf)); + nresult = lookup_one(mnt_user_ns(mnt), nbuf, + target_dir, strlen(nbuf)); if (!IS_ERR(nresult)) { if (unlikely(nresult->d_inode != result->d_inode)) { dput(nresult);