Commit 3c96ec56 authored Apr 10, 2020 by Xin Long Committed by Steffen Klassert Apr 15, 2020

esp6: get the right proto for transport mode in esp6_gso_encap



For transport mode, when ipv6 nexthdr is set, the packet format might
be like:

    ----------------------------------------------------
    |        | dest |     |     |      |  ESP    | ESP |
    | IP6 hdr| opts.| ESP | TCP | Data | Trailer | ICV |
    ----------------------------------------------------

What it wants to get for x-proto in esp6_gso_encap() is the proto that
will be set in ESP nexthdr. So it should skip all ipv6 nexthdrs and
get the real transport protocol. Othersize, the wrong proto number
will be set into ESP nexthdr.

This patch is to skip all ipv6 nexthdrs by calling ipv6_skip_exthdr()
in esp6_gso_encap().

Fixes: 7862b405 ("esp: Add gso handlers for esp4 and esp6")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 06a0afcf

net/ipv6/esp6_offload.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -123,9 +123,16 @@ static void esp6_gso_encap(struct xfrm_state x, struct sk_buff skb)
		struct ip_esp_hdr *esph;
		struct ipv6hdr *iph = ipv6_hdr(skb);
		struct xfrm_offload *xo = xfrm_offload(skb);
		int proto = iph->nexthdr;
		u8 proto = iph->nexthdr;

		skb_push(skb, -skb_network_offset(skb));

		if (x->outer_mode.encap == XFRM_MODE_TRANSPORT) {
		__be16 frag;

		ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &proto, &frag);
		}

		esph = ip_esp_hdr(skb);
		*skb_mac_header(skb) = IPPROTO_ESP;

Admin message