Commit 0ad352cb authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: ipv6: expand skb head in ip6_route_me_harder after oif change 



Expand the skb headroom if the oif changed due to rerouting similar to
how IPv4 packets are handled.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent c7232c99

net/ipv6/netfilter.c

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ int ip6_route_me_harder(struct sk_buff *skb) 
{

	struct net *net = dev_net(skb_dst(skb)->dev);

	const struct ipv6hdr *iph = ipv6_hdr(skb);

	unsigned int hh_len;

	struct dst_entry *dst;

	struct flowi6 fl6 = {

		.flowi6_oif = skb->sk ? skb->sk->sk_bound_dev_if : 0,
@@ -47,6 +48,13 @@ int ip6_route_me_harder(struct sk_buff *skb) 
	}

#endif



	/* Change in oif may mean change in hh_len. */

	hh_len = skb_dst(skb)->dev->hard_header_len;

	if (skb_headroom(skb) < hh_len &&

	    pskb_expand_head(skb, HH_DATA_ALIGN(hh_len - skb_headroom(skb)),

			     0, GFP_ATOMIC))

		return -1;



	return 0;

}

EXPORT_SYMBOL(ip6_route_me_harder);