net: fix network drivers ndo_start_xmit() return values (part 6)
authorPatrick McHardy <kaber@trash.net>
Fri, 12 Jun 2009 05:20:01 +0000 (05:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Jun 2009 08:18:42 +0000 (01:18 -0700)
Fix up hamradio drivers that return an errno value to dev_queue_xmit(), causing
it to print a warning an free the skb.

- bpqether: skb is freed: use after free

Compile tested only.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hamradio/bpqether.c

index d509b371a562165bc22cfd086fae186b7130ef2b..5105548ad50c6ad0ccb73efaea382066b0af255b 100644 (file)
@@ -274,7 +274,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
                if ((newskb = skb_realloc_headroom(skb, AX25_BPQ_HEADER_LEN)) == NULL) {
                        printk(KERN_WARNING "bpqether: out of memory\n");
                        kfree_skb(skb);
-                       return -ENOMEM;
+                       return NETDEV_TX_OK;
                }
 
                if (skb->sk != NULL)
@@ -294,7 +294,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
        if ((dev = bpq_get_ether_dev(dev)) == NULL) {
                dev->stats.tx_dropped++;
                kfree_skb(skb);
-               return -ENODEV;
+               return NETDEV_TX_OK;
        }
 
        skb->protocol = ax25_type_trans(skb, dev);