diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-12 03:00:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-13 01:18:32 -0700 |
| commit | 3790c8cdb99f23824b23cb16df608281b335ee91 (patch) | |
| tree | c437f801a709cefcf1210eb1e9f8306e52f42ca6 /drivers/net/ethoc.c | |
| parent | da6782927de809d9d427bd4bd6a4024243e41f13 (diff) | |
| download | op-kernel-dev-3790c8cdb99f23824b23cb16df608281b335ee91.zip op-kernel-dev-3790c8cdb99f23824b23cb16df608281b335ee91.tar.gz | |
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 91a9b1a..ceb6a9c 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) if (unlikely(skb->len > ETHOC_BUFSIZ)) { priv->stats.tx_errors++; - return -EMSGSIZE; + goto out; } entry = priv->cur_tx % priv->num_tx; @@ -840,9 +840,9 @@ static int ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) } dev->trans_start = jiffies; - dev_kfree_skb(skb); - spin_unlock_irq(&priv->lock); +out: + dev_kfree_skb(skb); return NETDEV_TX_OK; } |
