diff options
author | Eric Dumazet <edumazet@google.com> | 2013-11-28 09:51:22 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-29 16:37:36 -0500 |
commit | f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76 (patch) | |
tree | 6938dd6d189b1a77cc5d10d55ad2d798f79d9b54 /net/ipv4/ping.c | |
parent | f5e0d34382e18f396d7673a84df8e3342bea7eb6 (diff) | |
download | linux-stable-f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76.tar.gz linux-stable-f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76.tar.bz2 linux-stable-f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76.zip |
inet: fix possible seqlock deadlocks
In commit c9e9042994d3 ("ipv4: fix possible seqlock deadlock") I left
another places where IP_INC_STATS_BH() were improperly used.
udp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from
process context, not from softirq context.
This was detected by lockdep seqlock support.
Reported-by: jongman heo <jongman.heo@samsung.com>
Fixes: 584bdf8cbdf6 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP")
Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ping.c')
-rw-r--r-- | net/ipv4/ping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 840cf1b9e6ee..242e7f4ed6f4 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -772,7 +772,7 @@ int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, err = PTR_ERR(rt); rt = NULL; if (err == -ENETUNREACH) - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES); + IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES); goto out; } |