diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-11-14 13:37:54 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-08 07:29:25 -0800 |
| commit | ac6a5b926d2d8df1596f7cb91f46afc18e5e39f9 (patch) | |
| tree | 372ff792d5b54001be023c36c9047074847e7a73 /net/ipv4 | |
| parent | f0173a11a965e9e6cc248ccf9efa88cfd22355f9 (diff) | |
| download | linux-3.10-ac6a5b926d2d8df1596f7cb91f46afc18e5e39f9.tar.gz linux-3.10-ac6a5b926d2d8df1596f7cb91f46afc18e5e39f9.tar.bz2 linux-3.10-ac6a5b926d2d8df1596f7cb91f46afc18e5e39f9.zip | |
ipv4: fix possible seqlock deadlock
[ Upstream commit c9e9042994d37cbc1ee538c500e9da1bb9d1bcdf ]
ip4_datagram_connect() being called from process context,
it should use IP_INC_STATS() instead of IP_INC_STATS_BH()
otherwise we can deadlock on 32bit arches, or get corruptions of
SNMP counters.
Fixes: 584bdf8cbdf6 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/datagram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index b28e863fe0a..19e36376d2a 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c @@ -57,7 +57,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) if (IS_ERR(rt)) { err = PTR_ERR(rt); if (err == -ENETUNREACH) - IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES); + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES); goto out; } |