* [PATCH] esp4: fix error return code in esp_output()
@ 2013-04-14 1:49 Wei Yongjun
2013-04-15 8:06 ` Steffen Klassert
2013-04-15 18:06 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Wei Yongjun @ 2013-04-14 1:49 UTC (permalink / raw)
To: davem, kuznet, jmorris, yoshfuji, kaber; +Cc: yongjun_wei, netdev
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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>
---
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);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] esp4: fix error return code in esp_output()
2013-04-14 1:49 [PATCH] esp4: fix error return code in esp_output() Wei Yongjun
@ 2013-04-15 8:06 ` Steffen Klassert
2013-04-15 18:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Steffen Klassert @ 2013-04-15 8:06 UTC (permalink / raw)
To: Wei Yongjun; +Cc: davem, kuznet, jmorris, yoshfuji, kaber, yongjun_wei, netdev
On Sun, Apr 14, 2013 at 09:49:03AM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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>
Thanks for catching this!
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] esp4: fix error return code in esp_output()
2013-04-14 1:49 [PATCH] esp4: fix error return code in esp_output() Wei Yongjun
2013-04-15 8:06 ` Steffen Klassert
@ 2013-04-15 18:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-04-15 18:06 UTC (permalink / raw)
To: weiyj.lk; +Cc: kuznet, jmorris, yoshfuji, kaber, yongjun_wei, netdev
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Sun, 14 Apr 2013 09:49:03 +0800
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-15 18:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-14 1:49 [PATCH] esp4: fix error return code in esp_output() Wei Yongjun
2013-04-15 8:06 ` Steffen Klassert
2013-04-15 18:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).