Skip to contentSkip to conversation

tcp: remove buggy call to tcp_v6_restore_cb()

PATCH In review Eric Dumazet 3 participants 3 messages Nov 30, 2017

Subsystems (3)
Networking Network drivers TCP
lore
Share & tools
lore

Eric Dumazet

author
#0 lore raw

PATCH 1/1 tcp: remove buggy call to tcp_v6_restore_cb()

From: Eric Dumazet <[email protected]>

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 271c3b9b7bda ("tcp: honour SO_BINDTODEVICE for TW_RST case too")
Signed-off-by Eric Dumazet <[email protected]>
Cc Florian Westphal <[email protected]>

---
 net/ipv6/tcp_ipv6.c |    1 -

 1 file changed, 1 deletion(-)
net/ipv6/tcp_ipv6.c +0 -1
index 6bb98c93edfe2ed2f16fe5229605f8108cfc7f9a..be11dc13aa705145a83177e17d23594e9416e11a 100644
@@ -1590,7 +1590,6 @@ static int tcp_v6_rcv(struct sk_buff *skb)
 		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;
maintainer
#2 lore raw
In reply to Eric Dumazet

From: Eric Dumazet <[email protected]>
Date: Wed, 29 Nov 2017 17:43:57 -0800

Quoted 7 lines

From: Eric Dumazet <[email protected]>

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

Quoted 8 lines

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 271c3b9b7bda ("tcp: honour SO_BINDTODEVICE for TW_RST case too")
Signed-off-by Eric Dumazet <[email protected]>

Applied and queued up for -stable.