From: Michael Chan <mchan@broadcom.com>
Date: Sun, 29 Jul 2012 19:15:44 +0000 (+0000)
Subject: tg3: Fix race condition in tg3_get_stats64()
X-Git-Tag: v2.6.39-400.9.0~338^2~141
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=245ba0319083e39a3766a037c0526feb93d3af82;p=users%2Fjedix%2Flinux-maple.git

tg3: Fix race condition in tg3_get_stats64()

Spinlock should be taken before checking for tp->hw_stats.

(cherry picked from commit 0f566b208b41918053b2e67399673aaec02dde5d)
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 3d46125d20db..9ac7ff869fc6 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -12570,10 +12570,12 @@ static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,
 {
 	struct tg3 *tp = netdev_priv(dev);
 
-	if (!tp->hw_stats)
+	spin_lock_bh(&tp->lock);
+	if (!tp->hw_stats) {
+		spin_unlock_bh(&tp->lock);
 		return &tp->net_stats_prev;
+	}
 
-	spin_lock_bh(&tp->lock);
 	tg3_get_nstats(tp, stats);
 	spin_unlock_bh(&tp->lock);