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

Commit d4b1e840 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[XFRM]: beet: fix beet mode decapsulation 



Beet mode decapsulation fails to properly set up the skb pointers, which
only works by accident in combination with CONFIG_NETFILTER, since in that
case the skb is fixed up in xfrm4_input before passing it to the netfilter
hooks.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04fef989

net/ipv4/xfrm4_mode_beet.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -83,24 +83,24 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) 
		if (!pskb_may_pull(skb, sizeof(*ph)))

		if (!pskb_may_pull(skb, sizeof(*ph)))

			goto out;

			goto out;





		phlen = ph->hdrlen * 8;

		phlen = sizeof(*ph) + ph->padlen;

		optlen = phlen - ph->padlen - sizeof(*ph);

		optlen = ph->hdrlen * 8 - phlen;

		if (optlen < 0 || optlen & 3 || optlen > 250)

		if (optlen < 0 || optlen & 3 || optlen > 250)

			goto out;

			goto out;





		if (!pskb_may_pull(skb, phlen))

		if (!pskb_may_pull(skb, phlen + optlen))

			goto out;

			goto out;





		ph_nexthdr = ph->nexthdr;

		ph_nexthdr = ph->nexthdr;

	}

	}





	skb_push(skb, sizeof(*iph) - phlen + optlen);

	skb->nh.raw = skb->data + (phlen - sizeof(*iph));

	memmove(skb->data, skb->nh.raw, sizeof(*iph));

	memmove(skb->nh.raw, iph, sizeof(*iph));

	skb->nh.raw = skb->data;

	skb->h.raw = skb->data + (phlen + optlen);





	iph = skb->nh.iph;

	iph = skb->nh.iph;

	iph->ihl = (sizeof(*iph) + optlen) / 4;

	iph->ihl = (sizeof(*iph) + optlen) / 4;

	iph->tot_len = htons(skb->len);

	iph->tot_len = htons(skb->len + iph->ihl * 4);

	iph->daddr = x->sel.daddr.a4;

	iph->daddr = x->sel.daddr.a4;

	iph->saddr = x->sel.saddr.a4;

	iph->saddr = x->sel.saddr.a4;

	if (ph_nexthdr)

	if (ph_nexthdr)