This is a note to let you know that I've just added the patch titled
inet: fix possible seqlock deadlocks
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
inet-fix-possible-seqlock-deadlocks.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Thu Dec 5 16:16:39 PST 2013
From: Eric Dumazet <edumazet@xxxxxxxxxx>
Date: Thu, 28 Nov 2013 09:51:22 -0800
Subject: inet: fix possible seqlock deadlocks
From: Eric Dumazet <edumazet@xxxxxxxxxx>
[ Upstream commit f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76 ]
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@xxxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
Acked-by: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/ipv4/ping.c | 2 +-
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv4/udp.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -769,7 +769,7 @@ int ping_v4_sendmsg(struct kiocb *iocb,
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;
}
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -177,7 +177,7 @@ int tcp_v4_connect(struct sock *sk, stru
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;
}
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -973,7 +973,7 @@ int udp_sendmsg(struct kiocb *iocb, stru
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;
}
Patches currently in stable-queue which might be from edumazet@xxxxxxxxxx are
queue-3.12/net-8139cp-fix-a-bug_on-triggered-by-wrong-bytes_compl.patch
queue-3.12/sch_tbf-handle-too-small-burst.patch
queue-3.12/gro-only-verify-tcp-checksums-for-candidates.patch
queue-3.12/net-tcp-fix-panic-in-tcp_fastopen_cache_set.patch
queue-3.12/tcp-tsq-restore-minimal-amount-of-queueing.patch
queue-3.12/pkt_sched-fq-fix-pacing-for-small-frames.patch
queue-3.12/ipv6-fix-possible-seqlock-deadlock-in-ip6_finish_output2.patch
queue-3.12/tcp-don-t-update-snd_nxt-when-a-socket-is-switched-from-repair-mode.patch
queue-3.12/inet-fix-possible-seqlock-deadlocks.patch
queue-3.12/net-x86-bpf-don-t-forget-to-free-sk_filter-v2.patch
queue-3.12/sit-fix-use-after-free-of-fb_tunnel_dev.patch
queue-3.12/net-clamp-msg_namelen-instead-of-returning-an-error.patch
queue-3.12/af_packet-block-bh-in-prb_shutdown_retire_blk_timer.patch
queue-3.12/pkt_sched-fq-change-classification-of-control.patch
queue-3.12/pkt_sched-fq-warn-users-using-defrate.patch
queue-3.12/gro-clean-up-tcpx_gro_receive-checksum-verification.patch
queue-3.12/ipv4-fix-possible-seqlock-deadlock.patch
queue-3.12/gso-handle-new-frag_list-of-frags-gro-packets.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html