mirror of
https://github.com/torvalds/linux.git
synced 2026-06-05 21:15:53 +02:00
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: 15b99ac172 ("[PATCH] pcmcia: add return value to _config() functions")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
178a4ff119
commit
1c40cde6b5
|
|
@ -113,6 +113,7 @@ static int com20020_probe(struct pcmcia_device *p_dev)
|
||||||
struct com20020_dev *info;
|
struct com20020_dev *info;
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
struct arcnet_local *lp;
|
struct arcnet_local *lp;
|
||||||
|
int ret = -ENOMEM;
|
||||||
|
|
||||||
dev_dbg(&p_dev->dev, "com20020_attach()\n");
|
dev_dbg(&p_dev->dev, "com20020_attach()\n");
|
||||||
|
|
||||||
|
|
@ -142,12 +143,18 @@ static int com20020_probe(struct pcmcia_device *p_dev)
|
||||||
info->dev = dev;
|
info->dev = dev;
|
||||||
p_dev->priv = info;
|
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:
|
fail_alloc_dev:
|
||||||
kfree(info);
|
kfree(info);
|
||||||
fail_alloc_info:
|
fail_alloc_info:
|
||||||
return -ENOMEM;
|
return ret;
|
||||||
} /* com20020_attach */
|
} /* com20020_attach */
|
||||||
|
|
||||||
static void com20020_detach(struct pcmcia_device *link)
|
static void com20020_detach(struct pcmcia_device *link)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user