This is a note to let you know that I've just added the patch titled
tcp: fix get_timewait4_sock() delay computation on 64bit
to the 3.13-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:
tcp-fix-get_timewait4_sock-delay-computation-on-64bit.patch
and it can be found in the queue-3.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From foo@baz Thu Apr 10 22:03:05 PDT 2014
From: Eric Dumazet <[email protected]>
Date: Thu, 27 Mar 2014 07:19:19 -0700
Subject: tcp: fix get_timewait4_sock() delay computation on 64bit
From: Eric Dumazet <[email protected]>
[ Upstream commit e2a1d3e47bb904082b758dec9d07edf241c45d05 ]
It seems I missed one change in get_timewait4_sock() to compute
the remaining time before deletion of IPV4 timewait socket.
This could result in wrong output in /proc/net/tcp for tm->when field.
Fixes: 96f817fedec4 ("tcp: shrink tcp6_timewait_sock by one cache line")
Signed-off-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/ipv4/tcp_ipv4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2629,7 +2629,7 @@ static void get_timewait4_sock(const str
{
__be32 dest, src;
__u16 destp, srcp;
- long delta = tw->tw_ttd - jiffies;
+ s32 delta = tw->tw_ttd - inet_tw_time_stamp();
dest = tw->tw_daddr;
src = tw->tw_rcv_saddr;
Patches currently in stable-queue which might be from [email protected] are
queue-3.13/tcp-fix-get_timewait4_sock-delay-computation-on-64bit.patch
queue-3.13/inet-frag-make-sure-forced-eviction-removes-all.patch
queue-3.13/tcp-tcp_release_cb-should-release-socket-ownership.patch
queue-3.13/pkt_sched-fq-do-not-hold-qdisc-lock-while-allocating.patch
queue-3.13/net-unix-non-blocking-recvmsg-should-not-return.patch
queue-3.13/tcp-syncookies-do-not-use-getnstimeofday.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
