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")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index 24150c9..dc3253b 100644 (file)
--- a/drivers/net/arcnet/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
@@ -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)