olympic.c: Checks for return values
Subsystems (2)
PATCH 1/1 olympic.c: Checks for return values
Hello all,
As per the TODO list on your website, register_netdev() should be audited for its return values.
The following could be an instance of wrong handling of return code.
I didn't compile this as I don't have the proper setup. Added to that, I am not sure if
the goto is the proper action. Please correct the patch if it is wrong, it is my first patch!
---
olympic.c 2006-09-15 22:11:09.099112040 +0300 renamed from drivers/net/tokenring/olympic.c 2006-09-09 06:23:24.000000000 +0300 +4 -1
@@ -265,7 +265,10 @@ static int __devinit olympic_probe(struc SET_NETDEV_DEV(dev, &pdev->dev); pci_set_drvdata(pdev,dev) ; - register_netdev(dev) ; + + if (register_netdev(dev) != 0) + goto op_free_dev; + printk("Olympic: %s registered as: %s\n",olympic_priv->olympic_card_name,dev->name); if (olympic_priv->olympic_network_monitor) { /* Must go after register_netdev as we need the device name */ char proc_name[20] ;
Signature · 6 lines
Hashem Masoud _______________________________________________ Kernel-janitors mailing list [email protected] https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 1 line · Hashem Masoud
Hello all,
Hi Hashem,
Quoted 10 lines
As per the TODO list on your website,
register_netdev()should be audited for its return values.
The following could be an instance of wrong handling of return code.I didn't compile this as I don't have the proper setup. Added to that, I am not sure if
the goto is the proper action. Please correct the patch if it is wrong, it is my first patch!
If you goto 'op_free_dev', you'll leave the mem io mapped (see 'op_free_iomap').
Regards,
Frederik
Quoted 27 lines
Signed-off-by Hashem Masoud < <https://lists.osdl.org/mailman/listinfo/kernel-janitors> masoudh at batelco.com.bh>---
olympic.c 2006-09-15 22:11:09.099112040 +0300 renamed from drivers/net/tokenring/olympic.c 2006-09-09 06:23:24.000000000 +0300 +4
-1@@ -265,7 +265,10 @@ static int __devinit olympic_probe(struc SET_NETDEV_DEV(dev, &pdev->dev); pci_set_drvdata(pdev,dev) ; - register_netdev(dev) ; + + if (register_netdev(dev) != 0) + goto op_free_dev; + printk("Olympic: %s registered as: %s\n",olympic_priv->olympic_card_name,dev->name); if (olympic_priv->olympic_network_monitor) { /* Must go after register_netdev as we need the device name */ char proc_name[20] ;Signature · 7 lines
-- Hashem Masoud _______________________________________________ Kernel-janitors mailing list [email protected] https://lists.osdl.org/mailman/listinfo/kernel-janitors
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 7 lines · Frederik Deweerdt
If you goto '
op_free_dev', you'll leave the mem io mapped (see 'op_free_iomap').
Regards,
Frederik
would this be the solution then?
---
--- /linux-2.6.17.13/drivers/net/tokenring/olympic.c 2006-09-09
06:23:24.000000000 +0300
+++ olympic.c 2006-09-16 17:12:07.233793920 +0300
@@ -265,7 +265,10 @@ static int __devinit olympic_probe(struc
SET_NETDEV_DEV(dev, &pdev->dev);
pci_set_drvdata(pdev,dev) ;- register_netdev(dev) ;
+
+ if (register_netdev(dev) != 0)
+ goto op_free_iomap ;
+
printk("Olympic: %s registered as:
%s\n",olympic_priv->olympic_card_name,dev->name);
if (olympic_priv->olympic_network_monitor) { /* Must go after
register_netdev as we need the device name */
char proc_name[20] ;Signature · 6 lines
Hashem Masoud _______________________________________________ Kernel-janitors mailing list [email protected] https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 15 lines · Hashem Masoud
olympic.c renamed from linux-2.6.17.13/drivers/net/tokenring/olympic.c +4
-1@@ -265,7 +265,10 @@ static int __devinit olympic_probe(strucSET_NETDEV_DEV (dev, &pdev->dev);pci_set_drvdata (pdev,dev) ; -register_netdev (dev) ; + +if (register_netdev (dev) !=0 ) + goto op_free_iomap ; + printk("Olympic: %s registered as: %s\n",olympic_priv->olympic_card_name,dev->name); if (olympic_priv->olympic_network_monitor) { /* Must go after
register_netdevas we need the device name */
Quoted 1 line
char proc_name[20] ;
That's almost it. However if you follow goto you'll notice that zero will be returned which is not a proper indication of error.
Ergo, I need you to propagate error from register_netdev(), read http://mbligh.org/linuxdocs/Email/Clients/Thunderbird , then send proper inline patch with proper Signed-off-by line (without "at", normal email). Also, you need to buy Thunderbird voodoo doll.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 10 lines · Alexey Dobriyan
That's almost it. However if you follow goto you'll notice that zero will be returned which is not a proper indication of error.
Ergo, I need you to propagate error from
register_netdev(), read http://mbligh.org/linuxdocs/Email/Clients/Thunderbird , then send proper inline patch with proper Signed-off-by line (without "at", normal email). Also, you need to buy Thunderbird voodoo doll.
Thanks, this is the newest patch:
---
olympic.c 2006-09-17 15:47:18.293705248 +0300 renamed from drivers/net/tokenring/olympic.c 2006-09-09 06:23:24.000000000 +0300 +5 -1
@@ -265,7 +265,11 @@ static int __devinit olympic_probe(struc SET_NETDEV_DEV(dev, &pdev->dev); pci_set_drvdata(pdev,dev) ; - register_netdev(dev) ; + + if ((i = register_netdev(dev))) { + goto op_free_iomap; + } + printk("Olympic: %s registered as: %s\n",olympic_priv->olympic_card_name,dev->name); if (olympic_priv->olympic_network_monitor) { /* Must go after register_netdev as we need the device name */ char proc_name[20] ;
I got the Thunderbird voodoo doll! But mutt is just too hard ;-)
Signature · 5 lines
Hashem Masoud _______________________________________________ Kernel-janitors mailing list [email protected] https://lists.osdl.org/mailman/listinfo/kernel-janitors