From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E90227A12D; Wed, 23 Apr 2025 14:54:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420050; cv=none; b=QS4gp/0dotVRUmqc9IaqCpxJLrTW4T/RfNbFMTgpdiIlJ/EwBLBw57BW5kYv7GNmqSlvjjDWOkIm6xrzS5rPvcnhFFuzF8seTFLNoONoCtYF3W7q1kLSX9JK+FEVj//VXONFdsiJNs6Eo5RhpfzS8MqlWREl8r1tX+FQFzirJxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420050; c=relaxed/simple; bh=bNgILPOLyKqqVprf77Hfd2k9H1L0ZE0l2kFfjyMGRs8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T3gpEh953FS74v3rOea0Py/JT9YslOM2HPlGiBaqe9tQ5xbMyAQHMlfn4sVd26faNvIBArJKMXjjYxvVmjWSHZ0vTViDpW3G6+RqmIDvFXRDxVbUcXeO7PYM0kg8+LNEvBA2a3C+kC2NT1Gu0pF89LAhzBDTM2SeWpjRrfd6jBQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=c6O8wjrp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="c6O8wjrp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7E2DC4CEE2; Wed, 23 Apr 2025 14:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745420050; bh=bNgILPOLyKqqVprf77Hfd2k9H1L0ZE0l2kFfjyMGRs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c6O8wjrpnd4aoUCDWxc200lpScycJrSvdqWnSHFUcTPMDlK73n5xiPDPVvoFo8KxE +xIimOWBBabUcaYP6PgWTxqWHkuh8ujD1pA+R2t9TUZR6lEdo4tFUw//ChjUWk8U6N MBLkHcJj5gZLzlKPydbZRaLd1zvosrxQEUcShkFQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Abdun Nihaal , Kory Maincent , Jiawen Wu , Paolo Abeni , Sasha Levin Subject: [PATCH 6.14 055/241] net: ngbe: fix memory leak in ngbe_probe() error path Date: Wed, 23 Apr 2025 16:41:59 +0200 Message-ID: <20250423142622.755100280@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142620.525425242@linuxfoundation.org> References: <20250423142620.525425242@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Abdun Nihaal [ Upstream commit 88fa80021b77732bc98f73fb69d69c7cc37b9f0d ] 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 Reviewed-by: Kory Maincent Reviewed-by: Jiawen Wu Link: https://patch.msgid.link/20250412154927.25908-1-abdun.nihaal@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- 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 53aeae2f884b0..1be2a5cc4a83c 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -607,7 +607,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); @@ -701,6 +701,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.39.5