Commit b047cf6d authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman

ipsec: Fix pskb_expand_head corruption in xfrm_state_check_space

[ Upstream commit d01dbeb6 ]

We're never supposed to shrink the headroom or tailroom.  In fact,
shrinking the headroom is a fatal action.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 877755eb
...@@ -27,10 +27,14 @@ static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb) ...@@ -27,10 +27,14 @@ static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
- skb_headroom(skb); - skb_headroom(skb);
int ntail = dst->dev->needed_tailroom - skb_tailroom(skb); int ntail = dst->dev->needed_tailroom - skb_tailroom(skb);
if (nhead > 0 || ntail > 0) if (nhead <= 0) {
return pskb_expand_head(skb, nhead, ntail, GFP_ATOMIC); if (ntail <= 0)
return 0;
return 0; nhead = 0;
} else if (ntail < 0)
ntail = 0;
return pskb_expand_head(skb, nhead, ntail, GFP_ATOMIC);
} }
static int xfrm_output_one(struct sk_buff *skb, int err) static int xfrm_output_one(struct sk_buff *skb, int err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment