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

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

[IPV6]: Ensure to have hop-by-hop options in our header of &sk_buff. 



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

net/ipv6/exthdrs.c

+12 −0
Original line number Diff line number Diff line
@@ -489,6 +489,18 @@ int ipv6_parse_hopopts(struct sk_buff *skb, int nhoff) 
{

	struct inet6_skb_parm *opt = IP6CB(skb);



	/*

	 * skb->nh.raw is equal to skb->data, and

	 * skb->h.raw - skb->nh.raw is always equal to

	 * sizeof(struct ipv6hdr) by definition of

	 * hop-by-hop options.

	 */

	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr) + 8) ||

	    !pskb_may_pull(skb, sizeof(struct ipv6hdr) + ((skb->h.raw[1] + 1) << 3))) {

		kfree_skb(skb);

		return -1;

	}



	opt->hop = sizeof(struct ipv6hdr);

	if (ip6_parse_tlv(tlvprochopopt_lst, skb)) {

		skb->h.raw += (skb->h.raw[1]+1)<<3;