From bae3b22d899fb9e18242b0ea1ae77397f1119f93 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 26 Aug 2012 19:14:08 +0200
Subject: [PATCH] --- yaml --- r: 327779 b: refs/heads/master c:
 0ad352cb433ed2b05921a32b5ee20410512e2320 h: refs/heads/master i:   327777:
 1e07dd97493709104402c79989e515e1160c9575   327775:
 d0f1f8bdbd4811ad82c207abc91444d7d9d04184 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv6/netfilter.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f855088256ee..81c5d064aba3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7232c9979cba684c50b64c513c4a83c9aa70563
+refs/heads/master: 0ad352cb433ed2b05921a32b5ee20410512e2320
diff --git a/trunk/net/ipv6/netfilter.c b/trunk/net/ipv6/netfilter.c
index db31561cc8df..429089cb073d 100644
--- a/trunk/net/ipv6/netfilter.c
+++ b/trunk/net/ipv6/netfilter.c
@@ -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);