netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jiawen Wu" <jiawenwu@trustnetic.com>
To: "'Abdun Nihaal'" <abdun.nihaal@gmail.com>
Cc: <Markus.Elfring@web.de>, <mengyuanlou@net-swift.com>,
	<andrew+netdev@lunn.ch>, <davem@davemloft.net>,
	<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
	<saikrishnag@marvell.com>, <przemyslaw.kitszel@intel.com>,
	<ecree.xilinx@gmail.com>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2 net] net: ngbe: fix memory leak in ngbe_probe() error path
Date: Tue, 15 Apr 2025 10:17:04 +0800	[thread overview]
Message-ID: <00b401dbadac$7b36f120$71a4d360$@trustnetic.com> (raw)
In-Reply-To: <20250412154927.25908-1-abdun.nihaal@gmail.com>

On Sat, Apr 12, 2025 11:49 PM, Abdun Nihaal wrote:
> When ngbe_sw_init() is called, memory is allocated for wx->rss_key
> in wx_init_rss_key(). However, in ngbe_probe() function, the subsequent
> error paths after ngbe_sw_init() don't free the rss_key. Fix that by
> freeing it in error path along with wx->mac_table.
> 
> Also change the label to which execution jumps when ngbe_sw_init()
> fails, because otherwise, it could lead to a double free for rss_key,
> when the mac_table allocation fails in wx_sw_init().
> 
> Fixes: 02338c484ab6 ("net: ngbe: Initialize sw info and register netdev")
> Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
> ---
> v1 -> v2:
> - Add fixes tag, as suggested by Markus and Jakub.
> - Also set the branch target as net instead of net-next as it is a fix
> 
> v1 link: https://lore.kernel.org/all/20250409053804.47855-1-abdun.nihaal@gmail.com
> 
>  drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> index a6159214ec0a..91b3055a5a9f 100644
> --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> @@ -625,7 +625,7 @@ static int ngbe_probe(struct pci_dev *pdev,
>  	/* setup the private structure */
>  	err = ngbe_sw_init(wx);
>  	if (err)
> -		goto err_free_mac_table;
> +		goto err_pci_release_regions;
> 
>  	/* check if flash load is done after hw power up */
>  	err = wx_check_flash_load(wx, NGBE_SPI_ILDR_STATUS_PERST);
> @@ -719,6 +719,7 @@ static int ngbe_probe(struct pci_dev *pdev,
>  err_clear_interrupt_scheme:
>  	wx_clear_interrupt_scheme(wx);
>  err_free_mac_table:
> +	kfree(wx->rss_key);
>  	kfree(wx->mac_table);
>  err_pci_release_regions:
>  	pci_release_selected_regions(pdev,
> --
> 2.47.2
> 

Reviewed-by: Jiawen Wu <jiawenwu@trustnetic.com>

Thanks Abdun,
I think this release bug is also present in txgbe driver.
 


  parent reply	other threads:[~2025-04-15  2:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-12 15:49 [PATCH v2 net] net: ngbe: fix memory leak in ngbe_probe() error path Abdun Nihaal
2025-04-14 14:06 ` Kory Maincent
2025-04-15  2:17 ` Jiawen Wu [this message]
2025-04-15  3:33   ` Abdun Nihaal
2025-04-15 14:20 ` patchwork-bot+netdevbpf

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='00b401dbadac$7b36f120$71a4d360$@trustnetic.com' \
    --to=jiawenwu@trustnetic.com \
    --cc=Markus.Elfring@web.de \
    --cc=abdun.nihaal@gmail.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=ecree.xilinx@gmail.com \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mengyuanlou@net-swift.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=przemyslaw.kitszel@intel.com \
    --cc=saikrishnag@marvell.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;
as well as URLs for NNTP newsgroup(s).