Преглед на файлове

ipv6: fix possible seqlock deadlock in ip6_finish_output2

IPv6 stats are 64 bits and thus are protected with a seqlock. By not
disabling bottom-half we could deadlock here if we don't disable bh and
a softirq reentrantly updates the same mib.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Hannes Frederic Sowa преди 11 години
родител
ревизия
7f88c6b23a
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      net/ipv6/ip6_output.c

+ 2 - 2
net/ipv6/ip6_output.c

@@ -116,8 +116,8 @@ static int ip6_finish_output2(struct sk_buff *skb)
 	}
 	}
 	rcu_read_unlock_bh();
 	rcu_read_unlock_bh();
 
 
-	IP6_INC_STATS_BH(dev_net(dst->dev),
-			 ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
+	IP6_INC_STATS(dev_net(dst->dev),
+		      ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
 	kfree_skb(skb);
 	kfree_skb(skb);
 	return -EINVAL;
 	return -EINVAL;
 }
 }