From: Jeff Layton <jlayton@kernel.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Chuck Lever <chuck.lever@oracle.com>,
"J. Bruce Fields" <bfields@redhat.com>,
Scott Mayhew <smayhew@redhat.com>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-nfs@vger.kernel.org
Subject: Re: [PATCH v2 1/3] nfsd: Fix a memory leak in an error handling path
Date: Thu, 01 Sep 2022 07:21:26 -0400 [thread overview]
Message-ID: <5c5d87f8329e44275bda36657be4de2390f065d4.camel@kernel.org> (raw)
In-Reply-To: <14d802144c88da0eb9e201b3acbf4bde376b2473.1662009844.git.christophe.jaillet@wanadoo.fr>
On Thu, 2022-09-01 at 07:27 +0200, Christophe JAILLET wrote:
> 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>
> ---
> fs/nfsd/nfs4recover.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
> index b29d27eaa8a6..248ff9f4141c 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;
Reviewed-by: Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2022-09-01 11:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 5:27 [PATCH v2 1/3] nfsd: Fix a memory leak in an error handling path Christophe JAILLET
2022-09-01 5:27 ` [PATCH v2 2/3] nfsd: Avoid some useless tests Christophe JAILLET
2022-09-01 11:22 ` Jeff Layton
2022-09-01 5:27 ` [PATCH v2 3/3] nfsd: Propagate some error code returned by memdup_user() Christophe JAILLET
2022-09-01 11:25 ` Jeff Layton
2022-09-01 11:21 ` Jeff Layton [this message]
2022-09-01 16:24 ` [PATCH v2 1/3] nfsd: Fix a memory leak in an error handling path Chuck Lever III
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5c5d87f8329e44275bda36657be4de2390f065d4.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=bfields@redhat.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=chuck.lever@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=smayhew@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox