diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-07-29 01:45:03 +0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-10-17 01:59:54 +0400 |
| commit | 661afcae1b6b6493e4ea69f81bae78397c066f25 (patch) | |
| tree | d1fed9b9a02510fa1534112180f56d953e3c7f2c /drivers/ieee1394 | |
| parent | 3bd90303f05d24487759e4990c3fed3e7a6b6955 (diff) | |
| download | linux-661afcae1b6b6493e4ea69f81bae78397c066f25.tar.xz | |
ieee1394: eth1394: fix lock imbalance
bad_proto can be reached from points which did not take priv->lock.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/eth1394.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 7aa0bf3e1028..b166b3575fa6 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c @@ -1220,23 +1220,19 @@ static int ether1394_data_handler(struct net_device *dev, int srcid, int destid, priv->stats.rx_errors++; priv->stats.rx_dropped++; dev_kfree_skb_any(skb); - goto bad_proto; - } - - if (netif_rx(skb) == NET_RX_DROP) { + } else if (netif_rx(skb) == NET_RX_DROP) { priv->stats.rx_errors++; priv->stats.rx_dropped++; - goto bad_proto; + } else { + priv->stats.rx_packets++; + priv->stats.rx_bytes += skb->len; } - /* Statistics */ - priv->stats.rx_packets++; - priv->stats.rx_bytes += skb->len; + spin_unlock_irqrestore(&priv->lock, flags); bad_proto: if (netif_queue_stopped(dev)) netif_wake_queue(dev); - spin_unlock_irqrestore(&priv->lock, flags); dev->last_rx = jiffies; |