Skip to contentSkip to conversation

Dereference in tokenring/olympic.c

PATCH New Eric Sesterhenn 1 participant 1 message Jun 21, 2006 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Dereference in tokenring/olympic.c

hi,

coverity found (bug id #225) that we might call free_netdev() with NULL argument, when alloc_trdev() fails. This patch changes the goto, so we dont call free_netdev() for dev == NULL.

drivers/net/tokenring/olympic.c renamed from drivers/net/tokenring/olympic.c.orig +2 -2
@@ -217,7 +217,7 @@ static int __devinit olympic_probe(struc
 	dev = alloc_trdev(sizeof(struct olympic_private)) ; 
 	if (!dev) {
 		i = -ENOMEM; 
-		goto op_free_dev;
+		goto op_release_dev;
 	}
 
 	olympic_priv = dev->priv ;
@@ -282,8 +282,8 @@ op_free_iomap:
 	if (olympic_priv->olympic_lap)
 		iounmap(olympic_priv->olympic_lap);
 
-op_free_dev:
 	free_netdev(dev);
+op_release_dev:
 	pci_release_regions(pdev); 
 
 op_disable_dev: