| From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> |
| Date: Sat, 13 Apr 2013 15:49:03 +0000 |
| Subject: esp4: fix error return code in esp_output() |
| |
| [ Upstream commit 06848c10f720cbc20e3b784c0df24930b7304b93 ] |
| |
| 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: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| net/ipv4/esp4.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/net/ipv4/esp4.c |
| +++ b/net/ipv4/esp4.c |
| @@ -137,8 +137,6 @@ static int esp_output(struct xfrm_state |
| |
| /* skb is pure payload to encrypt */ |
| |
| - err = -ENOMEM; |
| - |
| esp = x->data; |
| aead = esp->aead; |
| alen = crypto_aead_authsize(aead); |
| @@ -174,8 +172,10 @@ static int esp_output(struct xfrm_state |
| } |
| |
| 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); |
