From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42B9B23A9BD for ; Wed, 9 Sep 2026 00:25:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788913530; cv=none; b=bZ9eolM9gtxEDuIx8i8w4Xsha1WW8jm1/sz4TmVWokBEpwUx1Q7l8gAJ11ge5HFEddTVg2JFmijuETkR6pkYcl596VlAkmCkuNRQreP6i4mXxsoHfmVbk/lGaPh/peSFDBKnphXJgEXSQXlUcz8TbhF0olmWFyl6me3du+dKEsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788913530; c=relaxed/simple; bh=ZQ/pLM5kc8WnOUh9wjlAx2nWbepieMMiycOjOjF8LgQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gSr0PstvZ0iCVNvf0vUjzWeuT14YVnyKZAW64HPD5y4+j2F2qe7NkixPpJD4dC4ISBeB2BUnDO8Z8vplWlKLG8eE5SNJxLHq7wVX1H9dyGNvQ0mw09s1ZKoB0F6Af64k+m1NBx1vK0OwoQGVqJMVboq/+UKBNIx/I2GI5zm93j8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KWruWliO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KWruWliO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D51A1F00A3A; Wed, 9 Sep 2026 00:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788913528; bh=7KpWfTA6isyUE2yyo4wzt/G98Hb94vtm7MzLQx7JjBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KWruWliOMrLqxS8VVzSAPhCPzMudGXiTNKrvF4ljN40RxeimkU6n8kpMdQa9lqZ1J j5CnuumJDkJSU0nNjgmTKsPYyE663iNX2b4UPQjRRW05baYkJp3jBkuKTdCxrbAS3b bxG8YUZ46DjT7IfnyVdNlpghPIeq6T7sUoQqBtGujQjqiv0+5FsploXtXh+fbTlXG8 31Nv756zb+JrABzw6SJ4Snd0CA/zQKuzTNIENaCMcArA9bybgX6cqsWylmRhJ5jWlt i+iKw82kHoRel3x8rPGbzCrp/R6rGAnWU2m/bKm2mY/fnKcUR5OVyRXtt10yMjaRPn TP5bZBXGCcQQA== From: Sasha Levin To: stable@vger.kernel.org Cc: Al Viro , Jeff Layton , Sasha Levin Subject: [PATCH 6.6.y 1/4] rpc_populate(): lift cleanup into callers Date: Tue, 8 Sep 2026 20:25:24 -0400 Message-ID: <20260909002527.728386-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090317-fame-salami-c28b@gregkh> References: <2026090317-fame-salami-c28b@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Al Viro [ Upstream commit 8be22c49646e47452e74aa0b97ea50fb04c271ed ] rpc_populate() is called either from fill_super (where we don't need to remove any files on failure - rpc_kill_sb() will take them all out anyway) or from rpc_mkdir_populate(), where we need to remove the directory we'd been trying to populate along with whatever we'd put into it before we failed. Simpler to combine that into simple_recursive_removal() there. Note that rpc_pipe is overlocking directories quite a bit - locked parent is no obstacle to finding a child in dcache, so keeping it locked won't prevent userland observing a partially built subtree. All we need is to follow minimal VFS requirements; it's not as if clients used directory locking for exclusion - tree changes are serialized, but that's done on ->pipefs_sb_lock. Reviewed-by: Jeff Layton Signed-off-by: Al Viro Stable-dep-of: 932a8cf6abb2 ("sunrpc: fix use-after-free in __rpc_clnt_handle_event and __rpc_clnt_remove_pipedir") Signed-off-by: Sasha Levin --- net/sunrpc/clnt.c | 35 +++++++++++++++-------------------- net/sunrpc/rpc_pipe.c | 10 +++++----- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 85cfd7b7c212a..c7243d26c190d 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -117,47 +117,49 @@ static void rpc_clnt_remove_pipedir(struct rpc_clnt *clnt) } } -static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb, +static int rpc_setup_pipedir_sb(struct super_block *sb, struct rpc_clnt *clnt) { static uint32_t clntid; const char *dir_name = clnt->cl_program->pipe_dir_name; char name[15]; struct dentry *dir, *dentry; + int err; dir = rpc_d_lookup_sb(sb, dir_name); if (dir == NULL) { pr_info("RPC: pipefs directory doesn't exist: %s\n", dir_name); - return dir; + return -ENOENT; } for (;;) { snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++); name[sizeof(name) - 1] = '\0'; dentry = rpc_create_client_dir(dir, name, clnt); - if (!IS_ERR(dentry)) + if (!IS_ERR(dentry)) { + err = 0; break; - if (dentry == ERR_PTR(-EEXIST)) + } + err = PTR_ERR(dentry); + if (err == -EEXIST) continue; printk(KERN_INFO "RPC: Couldn't create pipefs entry" - " %s/%s, error %ld\n", - dir_name, name, PTR_ERR(dentry)); + " %s/%s, error %d\n", + dir_name, name, err); break; } dput(dir); - return dentry; + return err; } static int rpc_setup_pipedir(struct super_block *pipefs_sb, struct rpc_clnt *clnt) { - struct dentry *dentry; - clnt->pipefs_sb = pipefs_sb; if (clnt->cl_program->pipe_dir_name != NULL) { - dentry = rpc_setup_pipedir_sb(pipefs_sb, clnt); - if (IS_ERR(dentry)) - return PTR_ERR(dentry); + int err = rpc_setup_pipedir_sb(pipefs_sb, clnt); + if (err && err != -ENOENT) + return err; } return 0; } @@ -185,16 +187,9 @@ static int rpc_clnt_skip_event(struct rpc_clnt *clnt, unsigned long event) static int __rpc_clnt_handle_event(struct rpc_clnt *clnt, unsigned long event, struct super_block *sb) { - struct dentry *dentry; - switch (event) { case RPC_PIPEFS_MOUNT: - dentry = rpc_setup_pipedir_sb(sb, clnt); - if (!dentry) - return -ENOENT; - if (IS_ERR(dentry)) - return PTR_ERR(dentry); - break; + return rpc_setup_pipedir_sb(sb, clnt); case RPC_PIPEFS_UMOUNT: __rpc_clnt_remove_pipedir(clnt); break; diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index f420d84573451..d54ca4b1599be 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -726,7 +726,6 @@ static int rpc_populate(struct dentry *parent, inode_unlock(dir); return 0; out_bad: - __rpc_depopulate(parent, files, start, eof); inode_unlock(dir); printk(KERN_WARNING "%s: %s failed to populate directory %pd\n", __FILE__, __func__, parent); @@ -750,14 +749,15 @@ static struct dentry *rpc_mkdir_populate(struct dentry *parent, goto out_err; if (populate != NULL) { error = populate(dentry, args_populate); - if (error) - goto err_rmdir; + if (error) { + inode_unlock(dir); + simple_recursive_removal(dentry, NULL); + return ERR_PTR(error); + } } out: inode_unlock(dir); return dentry; -err_rmdir: - __rpc_rmdir(dir, dentry); out_err: dentry = ERR_PTR(error); goto out; -- 2.53.0