diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-13 17:49:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-15 20:05:34 +0200 |
| commit | 06848c10f720cbc20e3b784c0df24930b7304b93 (patch) | |
| tree | 34e479b53aaedb4644cad7c7e6ed28e4b7ddf6ba /net | |
| parent | bridge: make user modified path cost sticky (diff) | |
| download | linux-06848c10f720cbc20e3b784c0df24930b7304b93.tar.xz linux-06848c10f720cbc20e3b784c0df24930b7304b93.zip | |
esp4: fix error return code in esp_output()
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/esp4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 3b4f0cd2e63e..4cfe34d4cc96 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); |