Commit 3016dad7 authored Nov 29, 2017 by Eric Dumazet Committed by David S. Miller Nov 30, 2017

tcp: remove buggy call to tcp_v6_restore_cb()



tcp_v6_send_reset() expects to receive an skb with skb->cb[] layout as
used in TCP stack.
MD5 lookup uses tcp_v6_iif() and tcp_v6_sdif() and thus
TCP_SKB_CB(skb)->header.h6

This patch probably fixes RST packets sent on behalf of a timewait md5
ipv6 socket.

Before Florian patch, tcp_v6_restore_cb() was needed before jumping to
no_tcp_socket label.

Fixes: 271c3b9b ("tcp: honour SO_BINDTODEVICE for TW_RST case too")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Florian Westphal <fw@strlen.de>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 90a6ec85

net/ipv6/tcp_ipv6.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1590,7 +1590,6 @@ do_time_wait:
		tcp_v6_timewait_ack(sk, skb);
		break;
		case TCP_TW_RST:
		tcp_v6_restore_cb(skb);
		tcp_v6_send_reset(sk, skb);
		inet_twsk_deschedule_put(inet_twsk(sk));
		goto discard_it;

Admin message