summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2022-09-01 07:27:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-21 12:38:01 +0200
commitcc3bca2110ac85cd964da997ef83d84cab0d49fb (patch)
tree5b219ae88c653b5f08e07a0f76cc19cb05e6da7e /fs
parent89bca739d3b70e9b14c146ca90a4230d62f561df (diff)
downloadlinux-stable-cc3bca2110ac85cd964da997ef83d84cab0d49fb.tar.gz
linux-stable-cc3bca2110ac85cd964da997ef83d84cab0d49fb.tar.bz2
linux-stable-cc3bca2110ac85cd964da997ef83d84cab0d49fb.zip
nfsd: Fix a memory leak in an error handling path
[ Upstream commit fd1ef88049de09bc70d60b549992524cfc0e66ff ] If this memdup_user() call fails, the memory allocated in a previous call a few lines above should be freed. Otherwise it leaks. Fixes: 6ee95d1c8991 ("nfsd: add support for upcall version 2") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4recover.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index c634483d85d2..8f24485e0f04 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -815,8 +815,10 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,
princhash.data = memdup_user(
&ci->cc_princhash.cp_data,
princhashlen);
- if (IS_ERR_OR_NULL(princhash.data))
+ if (IS_ERR_OR_NULL(princhash.data)) {
+ kfree(name.data);
return -EFAULT;
+ }
princhash.len = princhashlen;
} else
princhash.len = 0;