Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 661afcae authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: eth1394: fix lock imbalance 



bad_proto can be reached from points which did not take priv->lock.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 3bd90303

drivers/ieee1394/eth1394.c

+5 −9
Original line number Diff line number Diff line
@@ -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;

	}



	/* Statistics */

	} else {

		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;