lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Patrick McHardy
2009-06-12 06:14:36 +00:00
committed by David S. Miller
parent 81fbbf6040
commit 5b2c4b972c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/usb/hso.c
View File

@@ -816,7 +816,7 @@ static int hso_net_start_xmit(struct sk_buff *skb, struct net_device *net)
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
/* we're done */ /* we're done */
return result; return NETDEV_TX_OK;
} }
static void hso_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) static void hso_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)

7
drivers/staging/at76_usb/at76_usb.c
View File

@@ -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", "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
priv->netdev->name, priv->tx_urb, priv->netdev->name, priv->tx_urb,
priv->tx_urb->hcpriv, priv->tx_urb->complete); priv->tx_urb->hcpriv, priv->tx_urb->complete);
} else { } else
stats->tx_bytes += skb->len; 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) static void at76_tx_timeout(struct net_device *netdev)