Eric Lee / smarc-ti-linux-kernel

22
Download as
Browse Code ยป

Commit f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76

Authored by Eric Dumazet
Committed by David S. Miller
1 parent f5e0d34382
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 3 changed files with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -772,7 +772,7 @@
772 772 err = PTR_ERR(rt);
773 773 rt = NULL;
774 774 if (err == -ENETUNREACH)
775   - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
  775 + IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
776 776 goto out;
777 777 }
778 778  
... ... @@ -177,7 +177,7 @@
177 177 if (IS_ERR(rt)) {
178 178 err = PTR_ERR(rt);
179 179 if (err == -ENETUNREACH)
180   - IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
  180 + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
181 181 return err;
182 182 }
183 183  
... ... @@ -999,7 +999,7 @@
999 999 err = PTR_ERR(rt);
1000 1000 rt = NULL;
1001 1001 if (err == -ENETUNREACH)
1002   - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
  1002 + IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
1003 1003 goto out;
1004 1004 }
1005 1005