[PATCH 3.8-stable] esp4: fix error return code in esp_output()

[PATCH 3.8-stable] esp4: fix error return code in esp_output()

[Jonghwan Choi]

This patch looks like it should be in the 3.8-stable tree, should we apply
it?

------------------

From: "Wei Yongjun <yongjun_wei@trendmicro.com.cn>"

commit 06848c10f720cbc20e3b784c0df24930b7304b93 upstream

Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
---
 net/ipv4/esp4.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 3b4f0cd..4cfe34d 100644
--- a/net/ipv4/esp4.c
+++ b/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);
--
1.7.9.5

Re: [PATCH 3.8-stable] esp4: fix error return code in esp_output()

[David Miller]

From: Jonghwan Choi <jhbird.choi@samsung.com>
Date: Thu, 18 Apr 2013 07:33:19 +0900

> This patch looks like it should be in the 3.8-stable tree, should we
> apply it?

It's in my networking -stable queue, I wish you would check it instead
of making more work for me replying to you to these kinds of emails.

	http://patchwork.ozlabs.org/bundle/davem/stable/?state=*

Thanks.