Skip to contentSkip to conversation

arcnet: fix potential memory leak in com20020_probe()

PATCH Applied Wang Hai 2 participants 2 messages Nov 20, 2022 – Nov 23, 2022

Subsystems (3)
lore
Share & tools
lore

Wang Hai

author
#0 lore raw

PATCH 1/1 arcnet: fix potential memory leak in com20020_probe()

In com20020_probe(), if com20020_config() fails, dev and info will not be freed, which will lead to a memory leak.

This patch adds freeing dev and info after com20020_config() fails to fix this bug.

Compile tested only.

Fixes 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions")
---
 drivers/net/arcnet/com20020_cs.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/arcnet/com20020_cs.c +9 -2
index 24150c933fcb..dc3253b318da 100644
@@ -113,6 +113,7 @@ static int com20020_probe(struct pcmcia_device *p_dev)
 	struct com20020_dev *info;
 	struct net_device *dev;
 	struct arcnet_local *lp;
+	int ret = -ENOMEM;
 
 	dev_dbg(&p_dev->dev, "com20020_attach()\n");
 
@@ -142,12 +143,18 @@ static int com20020_probe(struct pcmcia_device *p_dev)
 	info->dev = dev;
 	p_dev->priv = info;
 
-	return com20020_config(p_dev);
+	ret = com20020_config(p_dev);
+	if (ret)
+		goto fail_config;
+
+	return 0;
 
+fail_config:
+	free_arcdev(dev);
 fail_alloc_dev:
 	kfree(info);
 fail_alloc_info:
-	return -ENOMEM;
+	return ret;
 } /* com20020_attach */
 
 static void com20020_detach(struct pcmcia_device *link)
Signature · 1 line
2.17.1
#1 lore raw
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:

Hello:

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

Quoted 9 lines · On Sun, 20 Nov 2022 14:24:38 +0800 you wrote:

In com20020_probe(), if com20020_config() fails, dev and info will not be freed, which will lead to a memory leak.

This patch adds freeing dev and info after com20020_config() fails to fix this bug.

Compile tested only.

[...]

Here is the summary with links:
- [net] arcnet: fix potential memory leak in com20020_probe()

    https://git.kernel.org/netdev/net/c/1c40cde6b517

You are awesome, thank you!

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