From: Dan Carpenter <dan.carpenter@oracle.com>
To: Colin King <colin.king@canonical.com>
Cc: "J . Bruce Fields" <bfields@fieldses.org>,
Jeff Layton <jlayton@kernel.org>,
linux-nfs@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] nfsd: fix memory leak of async_copy
Date: Tue, 17 Jul 2018 12:30:05 +0300 [thread overview]
Message-ID: <20180717093005.3ggy24fskb3bxtni@mwanda> (raw)
In-Reply-To: <20180716120954.6720-1-colin.king@canonical.com>
On Mon, Jul 16, 2018 at 01:09:54PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> In the case where async_copy is successfully allocated but
> the call to nfs4_init_cp_state fails, async_copy is not
> currently freed and the memory is leaked. Fix this by kfree'ing
> it before returning.
>
> Detected by CoverityScan, CID#1471823 ("Resource leak")
>
> Fixes: beb1814d5a8a ("NFSD create new stateid for async copy")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> fs/nfsd/nfs4proc.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index 8f3368353aaf..3fb96a2708b9 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -1295,8 +1295,10 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> async_copy = kzalloc(sizeof(struct nfsd4_copy), GFP_KERNEL);
> if (!async_copy)
> goto out;
> - if (!nfs4_init_cp_state(nn, copy))
> + if (!nfs4_init_cp_state(nn, copy)) {
> + kfree(async_copy);
> goto out;
It really feels like both this and the kzalloc() failure should be doing
an of fput() of copy->file_src and copy->file_dst. The goto out_err
does an list_del(©->copies); but it happens before the
"list_add(&async_copy->copies ..." so that's likely wrong as well.
regards,
dan carpenter
next prev parent reply other threads:[~2018-07-17 10:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 12:09 [PATCH] nfsd: fix memory leak of async_copy Colin King
2018-07-17 9:30 ` Dan Carpenter [this message]
2018-07-17 9:33 ` Colin Ian King
2018-07-17 10:13 ` J . Bruce Fields
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=20180717093005.3ggy24fskb3bxtni@mwanda \
--to=dan.carpenter@oracle.com \
--cc=bfields@fieldses.org \
--cc=colin.king@canonical.com \
--cc=jlayton@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).