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

Commit e5d25a90 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6] XFRM: Fix decoding session with preceding extension header(s). 



We did not correctly decode session with preceding extension
header(s).  This was because we had already pulled preceding
headers, skb->nh.raw + 40 + 1 - skb->data was minus, and
pskb_may_pull() failed.

We now have IP6CB(skb)->nhoff and skb->h.raw, and we can
start parsing / decoding upper layer protocol from current
position.

Tracked down by Noriaki TAKAMIYA <takamiya@po.ntts.co.jp>
and tested by Kazunori Miyazawa <kazunori@miyazawa.org>.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3cae904

net/ipv6/xfrm6_policy.c

+2 −2
Original line number Diff line number Diff line
@@ -191,10 +191,10 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int 
static inline void

_decode_session6(struct sk_buff *skb, struct flowi *fl)

{

	u16 offset = sizeof(struct ipv6hdr);

	u16 offset = skb->h.raw - skb->nh.raw;

	struct ipv6hdr *hdr = skb->nh.ipv6h;

	struct ipv6_opt_hdr *exthdr;

	u8 nexthdr = skb->nh.ipv6h->nexthdr;

	u8 nexthdr = skb->nh.raw[IP6CB(skb)->nhoff];



	memset(fl, 0, sizeof(struct flowi));

	ipv6_addr_copy(&fl->fl6_dst, &hdr->daddr);