From 5c30052494f8a2696f1e057aaeda2519c8f5ebe8 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sat, 13 Apr 2013 15:49:03 +0000
Subject: [PATCH] --- yaml --- r: 362579 b: refs/heads/master c:
 06848c10f720cbc20e3b784c0df24930b7304b93 h: refs/heads/master i:   362577:
 dacacbdf35a5c792611b3ce198752d5376fed424   362575:
 34f997f8d0b49d44c362ffec746c3a71e52f324d v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/esp4.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 88a4449221af..b99f81684d27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f3359bdc83f1abb1989e0817ab0e0b18667c828
+refs/heads/master: 06848c10f720cbc20e3b784c0df24930b7304b93
diff --git a/trunk/net/ipv4/esp4.c b/trunk/net/ipv4/esp4.c
index 3b4f0cd2e63e..4cfe34d4cc96 100644
--- a/trunk/net/ipv4/esp4.c
+++ b/trunk/net/ipv4/esp4.c
@@ -139,8 +139,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
 
 	/* skb is pure payload to encrypt */
 
-	err = -ENOMEM;
-
 	esp = x->data;
 	aead = esp->aead;
 	alen = crypto_aead_authsize(aead);
@@ -176,8 +174,10 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
 	}
 
 	tmp = esp_alloc_tmp(aead, nfrags + sglists, seqhilen);
-	if (!tmp)
+	if (!tmp) {
+		err = -ENOMEM;
 		goto error;
+	}
 
 	seqhi = esp_tmp_seqhi(tmp);
 	iv = esp_tmp_iv(aead, tmp, seqhilen);