| From 9ee51267f6c39a4f3c63ad470c8f978b502fc8e2 Mon Sep 17 00:00:00 2001 |
| From: Eric Dumazet <edumazet@google.com> |
| Date: Thu, 14 Nov 2013 13:37:54 -0800 |
| Subject: ipv4: fix possible seqlock deadlock |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| [ 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> |
| --- |
| net/ipv4/datagram.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/ipv4/datagram.c |
| +++ b/net/ipv4/datagram.c |
| @@ -57,7 +57,7 @@ int ip4_datagram_connect(struct sock *sk |
| 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; |
| } |
| |