From patchwork Mon Sep 11 18:38:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krister Johansen X-Patchwork-Id: 13379775 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 26B4DCA0EC3 for ; Mon, 11 Sep 2023 21:03:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240317AbjIKU4Z (ORCPT ); Mon, 11 Sep 2023 16:56:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244003AbjIKSjD (ORCPT ); Mon, 11 Sep 2023 14:39:03 -0400 Received: from bee.birch.relay.mailchannels.net (bee.birch.relay.mailchannels.net [23.83.209.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6F3A1AB for ; Mon, 11 Sep 2023 11:38:58 -0700 (PDT) X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 2E6B7901526 for ; Mon, 11 Sep 2023 18:38:58 +0000 (UTC) Received: from pdx1-sub0-mail-a294.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id BF62D90179E for ; Mon, 11 Sep 2023 18:38:57 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1694457537; a=rsa-sha256; cv=none; b=MEkT0Ypl16CMW18lHEM6WCjX2zsUiLil1nuXK5H6mNEU57pFlvNYwjtb1D49fkJNE9HS6r HWBru9fSpDkwG8DF0XcWvfCEAJOQ3Dobb2qYf+m11n78C+7ForNTpuGF8aGmnDEKTtMib2 ++6rwt1RD/Pu2pry8ar7ay7hNreomrheOAFQXlpwSXhO54khRy9+tisFmfvJ5r5aYZP1QK Z5Xr1puVeMpNW8KN0G5kZGEnjTWi/7+QLO6ZzjESQrbXs9o1NcqKM7Sr8KcFqyw0rcNhea DyWZoW559LFBxLqNivWxYdQQYvDDLTip5F3ulPXtQqPSHwuy2jPUh/SKfDr41w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1694457537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:dkim-signature; bh=x5eKf/3bpwwZrGrVqo6lwbtBUJZWR7VnhoHkdzXsdKA=; b=BydvSVKUTIgbaCDE+80xwhmAz1+mmsiePzig/OhInlZfVjglXPGwfN5B5X4qto72LtmUla l6dfAbWGFa0aC/O12c5YA/3164XXgv9ZiTvRsR5wHfDxJdFUlafx2suMYB9jKcCM2YEvp9 +Zvw/FkHd53F1vVBWm3tGJ1uTrkNBQuqtR/R7ph8TFGRziO47XxdzxtcnCrpRe+dHObHiH Tigju4Vc9MCkUNv45gzH0faD7/UAgRLfQ5s1sbaLUJt0mcFhgCfGhBo3uWhCBa6Dakh+Bf 6dQTwxNLnc4w4u30ww8uuZIEV7E69Vp+Li9xR888InpBYRUCJaAgfDuiNr95lg== ARC-Authentication-Results: i=1; rspamd-7d5dc8fd68-584s2; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Cellar-Ski: 59bff4ab14a87912_1694457538008_245589200 X-MC-Loop-Signature: 1694457538008:2154746830 X-MC-Ingress-Time: 1694457538008 Received: from pdx1-sub0-mail-a294.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.119.184.243 (trex/6.9.1); Mon, 11 Sep 2023 18:38:58 +0000 Received: from kmjvbox (c-73-231-176-24.hsd1.ca.comcast.net [73.231.176.24]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a294.dreamhost.com (Postfix) with ESMTPSA id 4RkwTs0jW7zTX for ; Mon, 11 Sep 2023 11:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1694457537; bh=x5eKf/3bpwwZrGrVqo6lwbtBUJZWR7VnhoHkdzXsdKA=; h=Date:From:To:Cc:Subject:Content-Type; b=oVQT3mbUqbwnEUwuo5trSBSUtzfLzK9YloTjzb1vG9clZk1W85Q/uO7B2MN7yEJI7 HEJ+UlzZiKWtI5YQOidmTXqT/0EITVvkP40HCdlSnwWQdMWvvZsPiNoMDcrCFn2zSw LSHkgpBKiCDbpwoswcKLCmxHWBiNDpn1KQCaqhcKS/bPVuvfD98gvVikn+A3gpNovq tcJ7ACXKVfTorRq0fKnqll1RQBlX7LEnC3Tw2PQymoMg0AJ96hHzBnRyvwNiNWM9cd DoF0jA+yNHBRi7S0kY6FSWOuyyZvSbtV/DD6kETKgbu+o7rcXqatFWtc/PYNdYx6KN M9Jiac0KB5dSA== Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e00c8 by kmjvbox (DragonFly Mail Agent v0.12); Mon, 11 Sep 2023 11:38:54 -0700 Date: Mon, 11 Sep 2023 11:38:54 -0700 From: Krister Johansen To: Miklos Szeredi , linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, German Maglione , Greg Kurz , Max Reitz Subject: [PATCH 2/2] fuse: ensure that submounts lookup their root Message-ID: <03b9823cf9a3db9da085f1e9282f19959e1672bc.1693440240.git.kjlx@templeofstupid.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Prior to this commit, the submount code assumed that the inode for the root filesystem could not be evicted. When eviction occurs the server may forget the inode. This author has observed a submount get an EBADF from a virtiofsd server that resulted from the sole dentry / inode pair getting evicted from a mount namespace and superblock where they were originally referenced. The dentry shrinker triggered a forget after killing the dentry with the last reference. As a result, a container that was also using this submount failed to access its filesystem because it had borrowed the reference instead of taking its own when setting up its superblock for the submount. Fix by ensuring that submount superblock configuration looks up the nodeid for the submount as well. Cc: stable@vger.kernel.org Fixes: 1866d779d5d2 ("fuse: Allow fuse_fill_super_common() for submounts") Signed-off-by: Krister Johansen --- fs/fuse/dir.c | 10 +++++----- fs/fuse/fuse_i.h | 6 ++++++ fs/fuse/inode.c | 43 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index afbdd223b0f3..37dd4800aa21 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -183,11 +183,11 @@ static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args, args->out_args[0].value = outarg; } -static int fuse_dentry_revalidate_lookup(struct fuse_mount *fm, - struct dentry *entry, - struct inode *inode, - struct fuse_entry_out *outarg, - bool *lookedup) +int fuse_dentry_revalidate_lookup(struct fuse_mount *fm, + struct dentry *entry, + struct inode *inode, + struct fuse_entry_out *outarg, + bool *lookedup) { struct dentry *parent; struct fuse_forget_link *forget; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index bf0b85d0b95c..f8ba293d5d30 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1325,6 +1325,12 @@ void fuse_dax_dontcache(struct inode *inode, unsigned int flags); bool fuse_dax_check_alignment(struct fuse_conn *fc, unsigned int map_alignment); void fuse_dax_cancel_work(struct fuse_conn *fc); +/* dir.c */ +int fuse_dentry_revalidate_lookup(struct fuse_mount *fm, struct dentry *entry, + struct inode *inode, + struct fuse_entry_out *outarg, + bool *lookedup); + /* ioctl.c */ long fuse_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long fuse_file_compat_ioctl(struct file *file, unsigned int cmd, diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index d47606206ec3..b3e7b0a397ae 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1464,7 +1464,13 @@ static int fuse_fill_super_submount(struct super_block *sb, struct fuse_mount *fm = get_fuse_mount_super(sb); struct super_block *parent_sb = parent_fi->inode.i_sb; struct fuse_attr root_attr; + struct fuse_inode *fi; struct inode *root; + struct inode *parent; + struct dentry *pdent; + struct fuse_entry_out outarg; + bool lookedup = false; + int ret; fuse_sb_defaults(sb); fm->sb = sb; @@ -1480,14 +1486,39 @@ static int fuse_fill_super_submount(struct super_block *sb, if (parent_sb->s_subtype && !sb->s_subtype) return -ENOMEM; - fuse_fill_attr_from_inode(&root_attr, parent_fi); - root = fuse_iget(sb, parent_fi->nodeid, 0, &root_attr, 0, 0); /* - * This inode is just a duplicate, so it is not looked up and - * its nlookup should not be incremented. fuse_iget() does - * that, though, so undo it here. + * It is necessary to lookup the parent_if->nodeid in case the dentry + * that triggered the automount of the submount is later evicted. + * If this dentry is evicted without the lookup count getting increased + * on the submount root, then the server can subsequently forget this + * nodeid which leads to errors when trying to access the root of the + * submount. */ - get_fuse_inode(root)->nlookup--; + parent = &parent_fi->inode; + pdent = d_find_alias(parent); + if (!pdent) + return -EINVAL; + + ret = fuse_dentry_revalidate_lookup(fm, pdent, parent, &outarg, + &lookedup); + dput(pdent); + /* + * The new root owns this nlookup on success, and it is incremented by + * fuse_iget(). In the case the lookup succeeded but revalidate fails, + * ensure that the lookup count is tracked by the parent. + */ + if (ret <= 0) { + if (lookedup) { + fi = get_fuse_inode(parent); + spin_lock(&fi->lock); + fi->nlookup++; + spin_unlock(&fi->lock); + } + return ret ? ret : -EINVAL; + } + + fuse_fill_attr_from_inode(&root_attr, parent_fi); + root = fuse_iget(sb, parent_fi->nodeid, 0, &root_attr, 0, 0); sb->s_d_op = &fuse_dentry_operations; sb->s_root = d_make_root(root); if (!sb->s_root)