diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-29 07:20:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-29 07:20:55 +0100 |
| commit | c1baa88431fe0fe4fad492dece4177a7735f89cf (patch) | |
| tree | 3513c0018bd149625aa999b82c0ed6097a55a267 /net/ipv4 | |
| parent | sctp: integer overflow in sctp_auth_create_key() (diff) | |
| parent | netfilter: nf_conntrack: make event callback registration per-netns (diff) | |
| download | linux-c1baa88431fe0fe4fad492dece4177a7735f89cf.tar.xz linux-c1baa88431fe0fe4fad492dece4177a7735f89cf.zip | |
Merge branch 'nf' of git://1984.lsi.us.es/net
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index 9899619ab9b8..4f47e064e262 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c @@ -64,7 +64,8 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type) /* 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_len - skb_headroom(skb), 0, GFP_ATOMIC)) + pskb_expand_head(skb, HH_DATA_ALIGN(hh_len - skb_headroom(skb)), + 0, GFP_ATOMIC)) return -1; return 0; |