diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-08-29 06:49:12 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-31 16:27:48 -0400 |
commit | 48f125ce1cc3ff275f9587b5bf56bf0f90766c7d (patch) | |
tree | 40cc8210126cdb67afffff0b18bf9b82e089cc4e /net | |
parent | fa026e223df2514b271b20f839ab05d7f21181b9 (diff) | |
download | linux-stable-48f125ce1cc3ff275f9587b5bf56bf0f90766c7d.tar.gz linux-stable-48f125ce1cc3ff275f9587b5bf56bf0f90766c7d.tar.bz2 linux-stable-48f125ce1cc3ff275f9587b5bf56bf0f90766c7d.zip |
net: ipv6: fix error return code
Initialize return variable before exiting on an error path.
The initial initialization of the return variable is also dropped, because
that value is never used.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/esp6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 6dc7fd353ef5..282f3723ee19 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -167,8 +167,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) struct esp_data *esp = x->data; /* skb is pure payload to encrypt */ - err = -ENOMEM; - aead = esp->aead; alen = crypto_aead_authsize(aead); @@ -203,8 +201,10 @@ static int esp6_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); |