Skip to contentSkip to conversation

bnxt_en: fix memory leak in bnxt_nvm_test()

PATCH Applied Michael Chan 2 participants 2 messages Oct 17, 2022 – Oct 19, 2022

Subsystems (3)
lore
Share & tools
lore

Michael Chan

author maintainer
#0 lore raw

PATCH 1/1 bnxt_en: fix memory leak in bnxt_nvm_test()

From: Vikas Gupta <[email protected]>

Free the kzalloc'ed buffer before returning in the success path.

Fixes 5b6ff128fdf6 ("bnxt_en: implement callbacks for devlink selftests")
---
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +6 -5
index a36803e79e92..8a6f788f6294 100644
@@ -613,6 +613,7 @@ static int bnxt_dl_reload_up(struct devlink *dl, enum devlink_reload_action acti
 
 static bool bnxt_nvm_test(struct bnxt *bp, struct netlink_ext_ack *extack)
 {
+	bool rc = false;
 	u32 datalen;
 	u16 index;
 	u8 *buf;
@@ -632,20 +633,20 @@ static bool bnxt_nvm_test(struct bnxt *bp, struct netlink_ext_ack *extack)
 
 	if (bnxt_get_nvram_item(bp->dev, index, 0, datalen, buf)) {
 		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd read error");
-		goto err;
+		goto done;
 	}
 
 	if (bnxt_flash_nvram(bp->dev, BNX_DIR_TYPE_VPD, BNX_DIR_ORDINAL_FIRST,
 			     BNX_DIR_EXT_NONE, 0, 0, buf, datalen)) {
 		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd write error");
-		goto err;
+		goto done;
 	}
 
-	return true;
+	rc = true;
 
-err:
+done:
 	kfree(buf);
-	return false;
+	return rc;
 }
 
 static bool bnxt_dl_selftest_check(struct devlink *dl, unsigned int id,
Signature · 1 line
2.18.1
#1 lore raw
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Mon, 17 Oct 2022 11:32:22 -0400 you wrote:

From: Vikas Gupta <[email protected]>

Free the kzalloc'ed buffer before returning in the success path.

Fixes 5b6ff128fdf6 ("bnxt_en: implement callbacks for devlink selftests")

[...]

Here is the summary with links:
- [net] bnxt_en: fix memory leak in bnxt_nvm_test()

    https://git.kernel.org/netdev/net/c/ba077d683d45

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html