Semi-pointless NULL test in uli526x driver
PATCH RESEND 1/1 Semi-pointless NULL test in uli526x driver
(resending previously submitted patch from 16/7-2007 22:40)
Hi,
In drivers/net/tulip/uli526x.c::uli526x_interrupt() there's a test of the function argument 'void *dev_id' against NULL. But that test is pretty pointless, since if ever 'dev_id' is NULL we'll already have crashed inside "netdev_priv(dev)".
I don't think dev_id can ever actually be NULL, so the whole block inside "if (!dev) {" could probably just go away. But I guess there's a good reason someone put that ULI526X_DBUG() in there - and if 'dev_id' /can/ actually be NULL then it's nice to have and in that case this patch actually fixes a possible crash (hence the version number update).
So I guess that in this case we should just move the
"db = netdev_priv(dev)" assignment past that NULL test. That's what this patch does.
Found by the Coverity checker.
Compile tested.
PS. Please keep me on Cc when replying.
---
drivers/net/tulip/uli526x.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/tulip/uli526x.c +4 -3
@@ -13,8 +13,8 @@*/ #define DRV_NAME "uli526x" -#define DRV_VERSION "0.9.3" -#define DRV_RELDATE "2005-7-29" +#define DRV_VERSION "0.9.4" +#define DRV_RELDATE "2007-7-16"#include <linux/module.h>
@@ -662,7 +662,7 @@ static int uli526x_stop(struct net_device *dev)static irqreturn_t uli526x_interrupt (int irq,void *dev_id) {struct net_device *dev = dev_id; -struct uli526x_board_info *db =netdev_priv (dev); +struct uli526x_board_info *db;unsigned long ioaddr = dev->base_addr;unsigned long flags;
@@ -670,6 +670,7 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id)ULI526X_DBUG (1 ,"uli526x_interrupt() without DEVICE arg" ,0 );return IRQ_NONE ; } + db =netdev_priv (dev);spin_lock_irqsave (&db->lock, flags);outl (0 , ioaddr +DCR7 );
Quoted 6 lines · Jesper Juhl
I don't think
dev_idcan ever actually be NULL, so the whole block inside "if (!dev) {" could probably just go away. But I guess there's a good reason someone put thatULI526X_DBUG()in there - and if 'dev_id' /can/ actually be NULL then it's nice to have and in that case this patch actually fixes a possible crash (hence the version number update).
It *can* be null, in the case of another handler being registered on the same irq number, passing NULL for the cookie.
Ack. Will apply.
Regards,
Kyle
Quoted 10 lines · Jesper Juhl
(resending previously submitted patch from 16/7-2007 22:40)
Hi,
In drivers/net/tulip/uli526x.c::uli526x_interrupt() there's a test of the function argument 'void
*dev_id' against NULL. But that test is pretty pointless, since if ever 'dev_id' is NULL we'll already have crashed inside "netdev_priv(dev)".I don't think
dev_idcan ever actually be NULL, so the whole block inside "if (!dev) {" could probably just go away. But I guess there's a good reason someone put thatULI526X_DBUG()in there - and
if 'dev_id' /can/ actually be NULL then it's nice to have and in that case this patch actually fixes a possible crash (hence the version number update). So I guess that in this case we should just move the "db =netdev_priv(dev)" assignment past that NULL test. That's what this patch does.
Quoted 8 lines
Found by the Coverity checker.
Compile tested.PS. Please keep me on Cc when replying.
Signed-off-by Jesper Juhl <[email protected]>
Just remove the dev==NULL test...
Thanks,
Jeff
Quoted 25 lines · Jeff Garzik
Quoted 24 lines · Jesper Juhl
(resending previously submitted patch from 16/7-2007 22:40)
Hi,
In drivers/net/tulip/uli526x.c::uli526x_interrupt() there's a test of the function argument 'void
*dev_id' against NULL. But that test is pretty pointless, since if ever 'dev_id' is NULL we'll already have crashed inside "netdev_priv(dev)".I don't think
dev_idcan ever actually be NULL, so the whole block inside "if (!dev) {" could probably just go away. But I guess there's a good reason someone put thatULI526X_DBUG()in there - and if 'dev_id' /can/ actually be NULL then it's nice to have and in that case this patch actually fixes a possible crash (hence the version number update).
So I guess that in this case we should just move the
"db =netdev_priv(dev)" assignment past that NULL test. That's what this patch does.Found by the Coverity checker.
Compile tested.
Quoted 7 lines
Quoted 4 lines
PS. Please keep me on Cc when replying.
Signed-off-by Jesper Juhl <[email protected]>Just remove the dev==NULL test...
Hmm, it would seem there's some disagreement about that :
On 04/08/07, Kyle McMartin <[email protected]> wrote:
...
Quoted 9 lines
It *can* be null, in the case of another handler being registered on the same irq number, passing NULL for the cookie.
Ack. Will apply.
Regards,
Kyle
I'll let you and Kyle fight it out :-)
Signature · 3 lines
Jesper Juhl <[email protected]> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html
Quoted 40 lines · Jesper Juhl
Quoted 25 lines · Jeff Garzik
Quoted 24 lines · Jesper Juhl
(resending previously submitted patch from 16/7-2007 22:40)
Hi,
In drivers/net/tulip/uli526x.c::uli526x_interrupt() there's a test of the function argument 'void
*dev_id' against NULL. But that test is pretty pointless, since if ever 'dev_id' is NULL we'll already have crashed inside "netdev_priv(dev)".I don't think
dev_idcan ever actually be NULL, so the whole block inside "if (!dev) {" could probably just go away. But I guess there's a good reason someone put thatULI526X_DBUG()in there - and if 'dev_id' /can/ actually be NULL then it's nice to have and in that case this patch actually fixes a possible crash (hence the version number update).
So I guess that in this case we should just move the
"db =netdev_priv(dev)" assignment past that NULL test. That's what this patch does.Found by the Coverity checker.
Compile tested.Quoted 6 lines
Quoted 4 lines
PS. Please keep me on Cc when replying.
Signed-off-by Jesper Juhl <[email protected]>Just remove the dev==NULL test...
Hmm, it would seem there's some disagreement about that :
On 04/08/07, Kyle McMartin <[email protected]> wrote:
...Quoted 3 lines
It *can* be null, in the case of another handler being registered on the same irq number, passing NULL for the cookie.
Quoted 7 lines
Quoted 5 lines
Ack. Will apply.
Regards,
KyleI'll let you and Kyle fight it out :-)
My official opinion (for net drivers and ATA at least): It is pointless having such a check in the hottest of driver hot paths, since a large majority of drivers do not have such a check.
It is better to fix the extremely rare oddball that passes NULL to request_irq(), than to update all drivers to be slower due to the oddballs.
Jeff