inet: fix possible seqlock deadlocks (f1d8cba6) · Commits · 戴 / test

In commit ("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: ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP") Fixes: ("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>

net/ipv4/ping.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

net/ipv4/tcp_ipv4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

net/ipv4/udp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message