diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-11 23:00:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-13 04:18:32 -0400 |
commit | 3790c8cdb99f23824b23cb16df608281b335ee91 (patch) | |
tree | c437f801a709cefcf1210eb1e9f8306e52f42ca6 /drivers/net/ethoc.c | |
parent | da6782927de809d9d427bd4bd6a4024243e41f13 (diff) |
net: fix network driver ndo_start_xmit() return values (part 1)
Fix up drivers that return an errno value to qdisc_restart(), causing
qdisc_restart() to print a warning and requeue/retransmit the skb.
- xpnet: memory allocation error, intention is to drop
- ethoc: oversized packet, packet must be dropped
- ibmlana: skb freed: use after free
- rrunner: skb freed: use after free
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethoc.c')
-rw-r--r-- | drivers/net/ethoc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 91a9b1a33764..ceb6a9c357ad 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c | |||
@@ -811,7 +811,7 @@ static int ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
811 | 811 | ||
812 | if (unlikely(skb->len > ETHOC_BUFSIZ)) { | 812 | if (unlikely(skb->len > ETHOC_BUFSIZ)) { |
813 | priv->stats.tx_errors++; | 813 | priv->stats.tx_errors++; |
814 | return -EMSGSIZE; | 814 | goto out; |
815 | } | 815 | } |
816 | 816 | ||
817 | entry = priv->cur_tx % priv->num_tx; | 817 | entry = priv->cur_tx % priv->num_tx; |
@@ -840,9 +840,9 @@ static int ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
840 | } | 840 | } |
841 | 841 | ||
842 | dev->trans_start = jiffies; | 842 | dev->trans_start = jiffies; |
843 | dev_kfree_skb(skb); | ||
844 | |||
845 | spin_unlock_irq(&priv->lock); | 843 | spin_unlock_irq(&priv->lock); |
844 | out: | ||
845 | dev_kfree_skb(skb); | ||
846 | return NETDEV_TX_OK; | 846 | return NETDEV_TX_OK; |
847 | } | 847 | } |
848 | 848 | ||