Commit acc393ae authored Sep 01, 2022 by Christophe JAILLET Committed by Greg Kroah-Hartman Oct 26, 2022

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: 6ee95d1c ("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>

parent d7f1e7af

fs/nfsd/nfs4recover.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -825,8 +825,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;