[2.6 patch] drivers/net/wireless/airo.c: correct a wrong check

From: Adrian Bunk
Date: Thu Mar 24 2005 - 19:16:47 EST


On Tue, Mar 22, 2005 at 05:34:03PM -0500, Jeff Garzik wrote:
> On Tue, Mar 22, 2005 at 11:30:56PM +0100, Adrian Bunk wrote:
>...
> > Is this "if" simply superfluous?
> > Or should the && be an || ?
>
> Yes, it looks like it should be "||".

Patch below.

> Jeff

cu
Adrian


<-- snip -->


The Coverity checker correctly noted that this condition can't ever be
fulfilled.

This patch changes it to what it should have been.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.12-rc1-mm1-full/drivers/net/wireless/airo.c.old 2005-03-22 21:41:37.000000000 +0100
+++ linux-2.6.12-rc1-mm1-full/drivers/net/wireless/airo.c 2005-03-22 22:50:03.000000000 +0100
@@ -3440,7 +3440,7 @@
/* Make sure we got something */
if (rxd.rdy && rxd.valid == 0) {
len = rxd.len + 12;
- if (len < 12 && len > 2048)
+ if (len < 12 || len > 2048)
goto badrx;

skb = dev_alloc_skb(len);
-
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html