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

Commit 7c88e21a authored by Yossi Kuperman's avatar Yossi Kuperman Committed by Steffen Klassert
Browse files

xfrm6: Fix IPv6 payload_len in xfrm6_transport_finish 



IPv6 payload length indicates the size of the payload, including any
extension headers.

In xfrm6_transport_finish, ipv6_hdr(skb)->payload_len is set to the
payload size only, regardless of the presence of any extension headers.
After ESP GRO transport mode decapsulation, ipv6_rcv trims the packet
according to the wrong payload_len, thus corrupting the packet.

Set payload_len to account for extension headers as well.

Fixes: 7785bba2 ("esp: Add a software GRO codepath")
Signed-off-by: default avatarYossi Kuperman <yossiku@mellanox.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent e747f643

net/ipv6/xfrm6_input.c

+1 −1
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async) 
		return 1;

#endif



	ipv6_hdr(skb)->payload_len = htons(skb->len);

	__skb_push(skb, skb->data - skb_network_header(skb));

	ipv6_hdr(skb)->payload_len = htons(skb->len - sizeof(struct ipv6hdr));



	if (xo && (xo->flags & XFRM_GRO)) {

		skb_mac_header_rebuild(skb);