sunrpc: fixed rollback in rpc_gssd_dummy_populate()

vaverin · amschuma-ntap · commit b7ade38165ca · 2020-06-26T08:43:14.000-04:00
__rpc_depopulate(gssd_dentry) was lost on error path cc: stable@vger.kernel.org Fixes: commit 4b9a445 ("sunrpc: create a new dummy pipe for gssd to hold open") Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
@@ -1317,6 +1317,7 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
 	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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1317,6 +1317,7 @@ rpc_gssd_dummy_populate(struct dentry root, struct rpc_pipe pipe_data)`
`1317`	`1317`	`q.len = strlen(gssd_dummy_clnt_dir[0].name);`
`1318`	`1318`	`clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);`
`1319`	`1319`	`if (!clnt_dentry) {`
	`1320`	`+ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);`
`1320`	`1321`	`pipe_dentry = ERR_PTR(-ENOENT);`
`1321`	`1322`	`goto out;`
`1322`	`1323`	`}`