Patch "tcp: tracepoint: only call trace_tcp_send_reset with full socket" has been added to the 4.15-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
tcp: tracepoint: only call trace_tcp_send_reset with full socket
to the 4.15-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-tracepoint-only-call-trace_tcp_send_reset-with-full-socket.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Mar 6 19:02:56 PST 2018
From: Song Liu <[email protected]>
Date: Tue, 6 Feb 2018 20:50:23 -0800
Subject: tcp: tracepoint: only call trace_tcp_send_reset with full socket
From: Song Liu <[email protected]>
[ Upstream commit 5c487bb9adddbc1d23433e09d2548759375c2b52 ]
tracepoint tcp_send_reset requires a full socket to work. However, it may be called when in TCP_TIME_WAIT:
case TCP_TW_RST:
tcp_v6_send_reset(sk, skb);
inet_twsk_deschedule_put(inet_twsk(sk));
goto discard_it;To avoid this problem, this patch checks the socket with sk_fullsock() before calling trace_tcp_send_reset().
--- net/ipv4/tcp_ipv4.c | 3 ++- net/ipv6/tcp_ipv6.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
net/ipv4/tcp_ipv4.c +2 -1
@@ -705,7 +705,8 @@ static void tcp_v4_send_reset(const stru*/ if (sk) { arg.bound_dev_if = sk->sk_bound_dev_if; -trace_tcp_send_reset (sk, skb); +if (sk_fullsock (sk)) +trace_tcp_send_reset (sk, skb); } BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) !=
net/ipv6/tcp_ipv6.c +2 -1
@@ -943,7 +943,8 @@ static void tcp_v6_send_reset(const struif (sk) { oif = sk->sk_bound_dev_if; -trace_tcp_send_reset (sk, skb); +if (sk_fullsock (sk)) +trace_tcp_send_reset (sk, skb); }tcp_v6_send_response (sk, skb, seq, ack_seq,0 ,0 ,0 , oif, key,1 ,0 ,0 );
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/tcp-tracepoint-only-call-trace_tcp_send_reset-with-full-socket.patch