diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-11 23:17:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-13 04:18:34 -0400 |
commit | 4bd73ae2682d9069746bb049a416d9ab90c6684b (patch) | |
tree | 06c1fa545e0fe2ee1e610db19fde49114b47f152 /drivers/net/irda/ks959-sir.c | |
parent | 3790c8cdb99f23824b23cb16df608281b335ee91 (diff) |
net: fix network drivers ndo_start_xmit() return values (part 2)
Fix up IRDA drivers that return an errno value to qdisc_restart(), causing
qdisc_restart() to print a warning an requeue/retransmit the skb.
- donauboe: intention appears to be to have the skb retransmitted without
error message
- irda-usb: intention is to drop silently according to comment
- kingsub-sir: skb is freed: use after free
- ks959-sir: skb is freed: use after free
- ksdazzle-sir: skb is freed: use after free
- mcs7880: skb is freed: use after free
All but donauboe compile tested.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/ks959-sir.c')
-rw-r--r-- | drivers/net/irda/ks959-sir.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index b6ffe9715b61..d73b8b64fcb9 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c | |||
@@ -391,9 +391,6 @@ static int ks959_hard_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
391 | unsigned int wraplen; | 391 | unsigned int wraplen; |
392 | int ret = 0; | 392 | int ret = 0; |
393 | 393 | ||
394 | if (skb == NULL || netdev == NULL) | ||
395 | return -EINVAL; | ||
396 | |||
397 | netif_stop_queue(netdev); | 394 | netif_stop_queue(netdev); |
398 | 395 | ||
399 | /* the IRDA wrapping routines don't deal with non linear skb */ | 396 | /* the IRDA wrapping routines don't deal with non linear skb */ |
@@ -428,7 +425,7 @@ static int ks959_hard_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
428 | dev_kfree_skb(skb); | 425 | dev_kfree_skb(skb); |
429 | spin_unlock(&kingsun->lock); | 426 | spin_unlock(&kingsun->lock); |
430 | 427 | ||
431 | return ret; | 428 | return NETDEV_TX_OK; |
432 | } | 429 | } |
433 | 430 | ||
434 | /* Receive callback function */ | 431 | /* Receive callback function */ |