From: Maxim Levitsky <mlevitsk@redhat.com>
To: Simon Horman <horms@kernel.org>, Michael Kelley <mhklinux@outlook.com>
Cc: "kvm@vger.kernel.org" <kvm@vger.kernel.org>,
Shradha Gupta <shradhagupta@linux.microsoft.com>,
Wei Liu <wei.liu@kernel.org>,
Haiyang Zhang <haiyangz@microsoft.com>,
Konstantin Taranov <kotaranov@microsoft.com>,
Yury Norov <yury.norov@gmail.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Eric Dumazet <edumazet@google.com>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
Long Li <longli@microsoft.com>, Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Leon Romanovsky <leon@kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Souradeep Chakrabarti <schakrabarti@linux.microsoft.com>,
Dexuan Cui <decui@microsoft.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] net: mana: Fix memory leak in mana_gd_setup_irqs
Date: Tue, 03 Dec 2024 19:25:17 -0500 [thread overview]
Message-ID: <5bc32310f882c45d8713e324dd30cc1ca41ed20a.camel@redhat.com> (raw)
In-Reply-To: <20241203162107.GF9361@kernel.org>
On Tue, 2024-12-03 at 16:21 +0000, Simon Horman wrote:
> On Thu, Nov 28, 2024 at 09:49:35PM +0000, Michael Kelley wrote:
> > From: Maxim Levitsky <mlevitsk@redhat.com> Sent: Thursday, November 28, 2024 11:43 AM
> > > Commit 8afefc361209 ("net: mana: Assigning IRQ affinity on HT cores")
> > > added memory allocation in mana_gd_setup_irqs of 'irqs' but the code
> > > doesn't free this temporary array in the success path.
> > >
> > > This was caught by kmemleak.
> > >
> > > Fixes: 8afefc361209 ("net: mana: Assigning IRQ affinity on HT cores")
> > > Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
> > > ---
> > > drivers/net/ethernet/microsoft/mana/gdma_main.c | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > > b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > > index e97af7ac2bb2..aba188f9f10f 100644
> > > --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > > +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > > @@ -1375,6 +1375,7 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
> > > gc->max_num_msix = nvec;
> > > gc->num_msix_usable = nvec;
> > > cpus_read_unlock();
> > > + kfree(irqs);
> > > return 0;
> > >
> > > free_irq:
> >
> > FWIW, there's a related error path leak. If the kcalloc() to populate
> > gc->irq_contexts fails, the irqs array is not freed. Probably could
> > extend this patch to fix that leak as well.
>
> Yes, as that problem also appears to be introduced by the cited commit
> I agree it would be good to fix them both in one patch.
>
I'll send a v2 tomorrow. Thanks for the review!
Best regards,
Maxim Levitsky
prev parent reply other threads:[~2024-12-04 0:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-28 19:43 Maxim Levitsky
2024-11-28 21:49 ` Michael Kelley
2024-11-29 2:13 ` Yury Norov
2024-11-30 18:37 ` Jakub Kicinski
2024-12-03 16:21 ` Simon Horman
2024-12-04 0:25 ` Maxim Levitsky [this message]
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=5bc32310f882c45d8713e324dd30cc1ca41ed20a.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=edumazet@google.com \
--cc=haiyangz@microsoft.com \
--cc=horms@kernel.org \
--cc=kotaranov@microsoft.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kys@microsoft.com \
--cc=leon@kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=mhklinux@outlook.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=schakrabarti@linux.microsoft.com \
--cc=shradhagupta@linux.microsoft.com \
--cc=wei.liu@kernel.org \
--cc=yury.norov@gmail.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
all inboxes | Powered by JetHome®