Skip to content

Commit 25a44ae

Browse files
lxinklassert
authored andcommitted
esp6: support ipv6 nexthdrs process for beet gso segment
For beet mode, when it's ipv6 inner address with nexthdrs set, the packet format might be: ---------------------------------------------------- | outer | | dest | | | ESP | ESP | | IP6 hdr| ESP | opts.| TCP | Data | Trailer | ICV | ---------------------------------------------------- Before doing gso segment in xfrm6_beet_gso_segment(), it should skip all nexthdrs and get the real transport proto, and set transport_header properly. This patch is to fix it by simply calling ipv6_skip_exthdr() in xfrm6_beet_gso_segment(). v1->v2: - remove skb_transport_offset(), as it will always return 0 in xfrm6_beet_gso_segment(), thank Sabrina's check. Fixes: 7f9e40e ("esp6: add gso_segment for esp6 beet mode") Signed-off-by: Xin Long <[email protected]> Signed-off-by: Steffen Klassert <[email protected]>
1 parent 9f0cadc commit 25a44ae

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

net/ipv6/esp6_offload.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static struct sk_buff *xfrm6_beet_gso_segment(struct xfrm_state *x,
171171
struct xfrm_offload *xo = xfrm_offload(skb);
172172
struct sk_buff *segs = ERR_PTR(-EINVAL);
173173
const struct net_offload *ops;
174-
int proto = xo->proto;
174+
u8 proto = xo->proto;
175175

176176
skb->transport_header += x->props.header_len;
177177

@@ -182,7 +182,12 @@ static struct sk_buff *xfrm6_beet_gso_segment(struct xfrm_state *x,
182182
proto = ph->nexthdr;
183183
}
184184

185-
if (x->sel.family != AF_INET6) {
185+
if (x->sel.family == AF_INET6) {
186+
__be16 frag;
187+
188+
skb->transport_header +=
189+
ipv6_skip_exthdr(skb, 0, &proto, &frag);
190+
} else {
186191
skb->transport_header -=
187192
(sizeof(struct ipv6hdr) - sizeof(struct iphdr));
188193

0 commit comments

Comments
 (0)