inet: fix possible seqlock deadlocks

edumazet · davem330 · commit f1d8cba61c3c · 2013-11-29T16:37:36.000-05:00
In commit c9e9042 ("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: 584bdf8 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP") Fixes: c319b4d ("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>
diff --git 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;
 	}
 
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
@@ -177,7 +177,7 @@ int tcp_v4_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);
 		return err;
 	}
 
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
@@ -999,7 +999,7 @@ int udp_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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ int ping_v4_sendmsg(struct kiocb iocb, struct sock sk, struct msghdr *msg,`
`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`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ int tcp_v4_connect(struct sock sk, struct sockaddr uaddr, int addr_len)`
`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`
Original file line number	Diff line number	Diff line change
`@@ -999,7 +999,7 @@ int udp_sendmsg(struct kiocb iocb, struct sock sk, struct msghdr *msg,`
`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`