From: "Bernard Metzler" <BMT@zurich.ibm.com>
To: "Dan Carpenter" <dan.carpenter@oracle.com>
Cc: "Doug Ledford" <dledford@redhat.com>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
linux-rdma@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] RDMA/siw: Fix a memory leak in siw_init_cpulist()
Date: Fri, 9 Aug 2019 14:28:50 +0000 [thread overview]
Message-ID: <OFD09B6B8D.A208B8E7-ON00258451.004F8BA4-00258451.004F8BAA@notes.na.collabserv.com> (raw)
In-Reply-To: <20190809140904.GB3552@mwanda>
-----"Dan Carpenter" <dan.carpenter@oracle.com> wrote: -----
>To: "Bernard Metzler" <bmt@zurich.ibm.com>
>From: "Dan Carpenter" <dan.carpenter@oracle.com>
>Date: 08/09/2019 04:09PM
>Cc: "Doug Ledford" <dledford@redhat.com>, "Jason Gunthorpe"
><jgg@ziepe.ca>, linux-rdma@vger.kernel.org,
>kernel-janitors@vger.kernel.org
>Subject: [EXTERNAL] [PATCH v2] RDMA/siw: Fix a memory leak in
>siw_init_cpulist()
>
>The error handling code doesn't free siw_cpu_info.tx_valid_cpus[0].
>The
>first iteration through the loop is a no-op so this is sort of an off
>by one bug. Also Bernard pointed out that we can remove the NULL
>assignment and simplify the code a bit.
>
>Fixes: bdcf26bf9b3a ("rdma/siw: network and RDMA core interface")
>Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>Reviewed-by: Bernard Metzler <bmt@zurich.ibm.com>
>---
>v2: Remove the NULL assignment like Bernard Metzler pointed out.
>
> drivers/infiniband/sw/siw/siw_main.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/drivers/infiniband/sw/siw/siw_main.c
>b/drivers/infiniband/sw/siw/siw_main.c
>index d0f140daf659..05a92f997f60 100644
>--- a/drivers/infiniband/sw/siw/siw_main.c
>+++ b/drivers/infiniband/sw/siw/siw_main.c
>@@ -160,10 +160,8 @@ static int siw_init_cpulist(void)
>
> out_err:
> siw_cpu_info.num_nodes = 0;
>- while (i) {
>+ while (--i >= 0)
> kfree(siw_cpu_info.tx_valid_cpus[i]);
>- siw_cpu_info.tx_valid_cpus[i--] = NULL;
>- }
> kfree(siw_cpu_info.tx_valid_cpus);
> siw_cpu_info.tx_valid_cpus = NULL;
>
>--
>2.20.1
>
>
Dan, many thanks for finding and fixing this!
Reviewed-by: Bernard Metzler <bmt@zurich.ibm.com>
next prev parent reply other threads:[~2019-08-09 14:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 10:16 [PATCH] RDMA/siw: Fix a memory leak in siw_init_cpulist() Dan Carpenter
2019-08-09 11:44 ` Bernard Metzler
2019-08-09 11:59 ` Dan Carpenter
2019-08-09 14:09 ` [PATCH v2] " Dan Carpenter
2019-08-09 14:28 ` Bernard Metzler [this message]
2019-08-12 14:53 ` Doug Ledford
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=OFD09B6B8D.A208B8E7-ON00258451.004F8BA4-00258451.004F8BAA@notes.na.collabserv.com \
--to=bmt@zurich.ibm.com \
--cc=dan.carpenter@oracle.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-rdma@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).