orinoco potentially dereferencing before check
drivers/net/wireless/orinoco_pci.c renamed from drivers/net/wireless/orinoco_pci.c~ +4 -2
@@ -275,14 +275,16 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); -struct orinoco_private *priv = dev->priv; +struct orinoco_private *priv;if (! dev)BUG (); + priv = dev->priv; +unregister_netdev (dev); -if (dev->irq) +if (dev->irq)free_irq (dev->irq, dev);if (priv->hw.iobase)
Quoted 12 lines · Dave Jones
+++
linux-2.6.5/drivers/net/wireless/orinoco_pci.c2004-04-16 22:17:30.000000000 +0100drivers/net/wireless/orinoco_pci.c renamed from drivers/net/wireless/orinoco_pci.c~ +1
-1@@ -275,14 +275,16 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); -struct orinoco_private *priv = dev->priv; +struct orinoco_private *priv;if (! dev)BUG ();
drivers/net/wireless/orinoco_pci.c
Quoted 10 lines
drivers/net/wireless/orinoco_pci.c renamed from drivers/net/wireless/orinoco_pci.c~ +3
-2+ priv = dev->priv; +unregister_netdev (dev); -if (dev->irq) +if (dev->irq)free_irq (dev->irq, dev);if (priv->hw.iobase) -
Better to just remove the if (! dev) BUG(). I don't believe we've ever hit that particular BUG() in debugging, so there's probably not much point having it.
It's already gone in the driver's development tree. Which hasn't been merged to Linus for months and months and should have been, yes, I know. Unfortunately I have barely any time or energy for maintaining the orinoco driver these days.
Signature · 4 lines
David Gibson | For every complex problem there is a david AT gibson.dropbear.id.au | solution which is simple, neat and | wrong. http://www.ozlabs.org/people/dgibson
Quoted 21 lines · David Gibson
Quoted 19 lines · Dave Jones
+++
linux-2.6.5/drivers/net/wireless/orinoco_pci.c2004-04-16 22:17:30.000000000 +0100drivers/net/wireless/orinoco_pci.c renamed from drivers/net/wireless/orinoco_pci.c~ +4
-2@@ -275,14 +275,16 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); -struct orinoco_private *priv = dev->priv; +struct orinoco_private *priv;if (! dev)BUG (); + priv = dev->priv; +unregister_netdev (dev); -if (dev->irq) +if (dev->irq)free_irq (dev->irq, dev);
Quoted 7 lines
Review
Quoted 2 lines
(quoted diff) +0
-1if (priv->hw.iobase) -Better to just remove the if (! dev)
BUG(). I don't believe we've ever hit that particularBUG()in debugging, so there's probably not much point having it.
done.
Jeff