Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6651ffc8 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

ipv6: Fix tcp_v6_send_response transport header setting. 



My recent patch to remove the open-coded checksum sequence in
tcp_v6_send_response broke it as we did not set the transport
header pointer on the new packet.

Actually, there is code there trying to set the transport
header properly, but it sets it for the wrong skb ('skb'
instead of 'buff').

This bug was introduced by commit
a8fdf2b3 ("ipv6: Fix
tcp_v6_send_response(): it didn't set skb transport header")

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8eabf95c

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1015,7 +1015,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win, 
	skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);

	skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);





	t1 = (struct tcphdr *) skb_push(buff, tot_len);

	t1 = (struct tcphdr *) skb_push(buff, tot_len);

	skb_reset_transport_header(skb);

	skb_reset_transport_header(buff);





	/* Swap the send and the receive. */

	/* Swap the send and the receive. */

	memset(t1, 0, sizeof(*t1));

	memset(t1, 0, sizeof(*t1));