net: fix network drivers ndo_start_xmit() return values (part 8)

Fix up USB drivers that return an errno value (result of usb_submit_urb())
to qdisc_restart(), causing qdisc_restart() to print a warning and requeue/
retransmit the skb.

- hso: skb is freed: use after free
- at76_usb: 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>

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index e3580f42c89908e065e532a7e9138f6dcd2a0b2c..f8c6d7ea72646ceb24fe1ccf480f80fffb5c7767 100644 (file)
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -816,7 +816,7 @@ static int hso_net_start_xmit(struct sk_buff *skb, struct net_device *net)
        }
        dev_kfree_skb(skb);
        /* we're done */
-       return result;
+       return NETDEV_TX_OK;
 }
 
 static void hso_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)

diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index c8af9a868d6219bcf140b389c43d0b690338163e..3f303ae97b43daf902f9c666556bd521d9404be5 100644 (file)
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -3242,12 +3242,11 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
                               "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
                               priv->netdev->name, priv->tx_urb,
                               priv->tx_urb->hcpriv, priv->tx_urb->complete);
-       } else {
+       } else
                stats->tx_bytes += skb->len;
-               dev_kfree_skb(skb);
-       }
 
-       return ret;
+       dev_kfree_skb(skb);
+       return NETDEV_TX_OK;
 }
 
 static void at76_tx_timeout(struct net_device *netdev)