diff options
| author | Hannes Frederic Sowa | 2013-11-29 06:39:44 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-11-30 18:48:13 +0100 |
| commit | 7f88c6b23afbd31545c676dea77ba9593a1a14bf (patch) | |
| tree | 632026254bc2ca731676e4327381dbe265153f76 /net/ipv6/ip6_output.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| download | kernel-qcow2-linux-7f88c6b23afbd31545c676dea77ba9593a1a14bf.tar.gz kernel-qcow2-linux-7f88c6b23afbd31545c676dea77ba9593a1a14bf.tar.xz kernel-qcow2-linux-7f88c6b23afbd31545c676dea77ba9593a1a14bf.zip | |
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>
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 59df872e2f4d..4acdb63495db 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -116,8 +116,8 @@ static int ip6_finish_output2(struct sk_buff *skb) } 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); return -EINVAL; } |