2020-06-01 08:57:03

by Vasily Averin

Subject: [PATCH] sunrpc: fixed rollback in rpc_gssd_dummy_populate()

__rpc_depopulate(gssd_dentry) was lost on error path

cc: [email protected]
Fixes: commit 4b9a445e3eeb ("sunrpc: create a new dummy pipe for gssd to hold open")
Signed-off-by: Vasily Averin <[email protected]>
---
net/sunrpc/rpc_pipe.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 39e14d5..e9d0953 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -1317,6 +1317,7 @@ void rpc_put_sb_net(const struct net *net)
q.len = strlen(gssd_dummy_clnt_dir[0].name);
clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);
if (!clnt_dentry) {
+ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
pipe_dentry = ERR_PTR(-ENOENT);
goto out;
}
--
1.8.3.1

2020-06-01 11:05:16

by Jeff Layton

Subject: Re: [PATCH] sunrpc: fixed rollback in rpc_gssd_dummy_populate()

On Mon, 2020-06-01 at 11:54 +0300, Vasily Averin wrote:
> __rpc_depopulate(gssd_dentry) was lost on error path
>
> cc: [email protected]
> Fixes: commit 4b9a445e3eeb ("sunrpc: create a new dummy pipe for gssd to hold open")
> Signed-off-by: Vasily Averin <[email protected]>
> ---
> net/sunrpc/rpc_pipe.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
> index 39e14d5..e9d0953 100644
> --- a/net/sunrpc/rpc_pipe.c
> +++ b/net/sunrpc/rpc_pipe.c
> @@ -1317,6 +1317,7 @@ void rpc_put_sb_net(const struct net *net)
> q.len = strlen(gssd_dummy_clnt_dir[0].name);
> clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);
> if (!clnt_dentry) {
> + __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
> pipe_dentry = ERR_PTR(-ENOENT);
> goto out;
> }

Good catch!

Reviewed-by: Jeff Layton <[email protected]>