1 files changed, 9 insertions, 8 deletions

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 3f964db908a7..dc50f1e71f76 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -27,10 +27,14 @@ static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
                 - skb_headroom(skb);
         int ntail = dst->dev->needed_tailroom - skb_tailroom(skb);
 
-        if (nhead > 0 || ntail > 0)
-                return pskb_expand_head(skb, nhead, ntail, GFP_ATOMIC);
-
-        return 0;
+        if (nhead <= 0) {
+                if (ntail <= 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)
@@ -112,16 +116,13 @@ error_nolock:
 int xfrm_output_resume(struct sk_buff *skb, int err)
 {
         while (likely((err = xfrm_output_one(skb, err)) == 0)) {
-                struct xfrm_state *x;
-
                 nf_reset(skb);
 
                 err = skb->dst->ops->local_out(skb);
                 if (unlikely(err != 1))
                         goto out;
 
-                x = skb->dst->xfrm;
-                if (!x)
+                if (!skb->dst->xfrm)
                         return dst_output(skb);
 
                 err = nf_hook(skb->dst->ops->family,