[PATCH] Memory leak in drivers_net_arlan.c (1)

From:  Pablo Menichini <pablo@menichini.com.ar>

drivers/net/arlan.c

@@ -1188,34 +1188,31 @@ static int __init
 {
 
 	struct net_device *dev;
+	struct arlan_private *ap;
 
 	ARLAN_DEBUG_ENTRY("arlan_allocate_device");
 
-	if (!devs)
-		dev = init_etherdev(0, sizeof(struct arlan_private));
-	else
-	{
-		dev = devs;
-		dev->priv = kmalloc(sizeof(struct arlan_private), GFP_KERNEL);
-	};
-
-	if (dev == NULL || dev->priv == NULL)
-	{
-		printk(KERN_CRIT "init_etherdev failed ");
+	if (!devs) {
+		dev = init_etherdev(0, sizeof(struct arlan_private) + sizeof(struct arlan_shmem));
+		if (!dev) {
+			printk(KERN_ERR "ARLAN: init_etherdev failed\n");
 			return 0;
 		}
-
-	memset(dev->priv,0,sizeof(struct arlan_private));
-
-	((struct arlan_private *) dev->priv)->conf =
-	    kmalloc(sizeof(struct arlan_shmem), GFP_KERNEL);
-
-	if (dev == NULL || dev->priv == NULL ||
-	    ((struct arlan_private *) dev->priv)->conf == NULL)
-	{
+		ap = dev->priv;
+		ap->config = dev->priv + sizeof(struct arlan_private);
+		ap->init_etherdev_alloc = 1;
+	} else {
+		dev = devs;
+		dev->priv = kmalloc(sizeof(struct arlan_private) + sizeof(struct arlan_shmem), GFP_KERNEL);
+		if (!dev->priv) {
+			printk(KERN_ERR "ARLAN: kmalloc of dev->priv failed\n");
 			return 0;
-		printk(KERN_CRIT " No memory at arlan_allocate_device \n");
 		}
+		ap = dev->priv;
+		ap->config = dev->priv + sizeof(struct arlan_private);
+		memset(ap, 0, sizeof(*ap));
+	}
+
 	/* Fill in the 'dev' fields. */
 	dev->base_addr = 0;
 	dev->mem_start = 0;
@@ -2056,6 +2053,7 @@ int init_module(void)
 void cleanup_module(void)
 {
 	int i = 0;
+	struct arlan_private ap;
 
 	ARLAN_DEBUG_ENTRY("cleanup_module");
 
@@ -2069,13 +2067,14 @@ void cleanup_module(void)
 
 //			release_mem_region(virt_to_phys(arlan_device[i]->mem_start), 0x2000 );
 			unregister_netdev(arlan_device[i]);
-			if (arlan_device[i]->priv)
-			{
-				if (((struct arlan_private *) arlan_device[i]->priv)->conf)
-					kfree(((struct arlan_private *) arlan_device[i]->priv)->conf);
+			ap = arlan_device[i]->priv;
+			if (ap->init_etherdev_alloc) {
 				kfree(arlan_device[i]);
-			}
 				arlan_device[i] = NULL;
+			} else {
+				kfree(ap);
+				ap = NULL;
+			}
 		}
 	}
 	ARLAN_DEBUG_EXIT("cleanup_module");

drivers/net/arlan.h

@@ -410,6 +410,7 @@ struct arlan_private {
       int	out_time10;
       int	in_bytes10;
       int	out_bytes10;
+      int	init_etherdev_alloc;
 };