aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2022-09-01 07:27:04 +0200
committerChuck Lever <chuck.lever@oracle.com>2022-09-26 14:02:21 -0400
commitfd1ef88049de09bc70d60b549992524cfc0e66ff (patch)
tree5680ee3af233c29ea9d5949faea29b72b9fbb70b
parentNFSD: remove redundant variable status (diff)
downloadlinux-dev-fd1ef88049de09bc70d60b549992524cfc0e66ff.tar.xz
linux-dev-fd1ef88049de09bc70d60b549992524cfc0e66ff.zip
nfsd: Fix a memory leak in an error handling path
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>
-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;