summaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-08-29 06:49:15 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-31 16:27:48 -0400
commit599901c3e4204e9d9c5a24df5402cd91617a2a26 (patch)
tree52612fcb3d56add7bfc4c257bbedbe25e587a477 /net/xfrm
parent48f125ce1cc3ff275f9587b5bf56bf0f90766c7d (diff)
downloadop-kernel-dev-599901c3e4204e9d9c5a24df5402cd91617a2a26.zip
op-kernel-dev-599901c3e4204e9d9c5a24df5402cd91617a2a26.tar.gz
net/xfrm/xfrm_state.c: fix error return code
Initialize return variable before exiting on an error path. 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/xfrm')
-rw-r--r--net/xfrm/xfrm_state.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 87cd0e4..210be48 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1994,8 +1994,10 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay)
goto error;
x->outer_mode = xfrm_get_mode(x->props.mode, family);
- if (x->outer_mode == NULL)
+ if (x->outer_mode == NULL) {
+ err = -EPROTONOSUPPORT;
goto error;
+ }
if (init_replay) {
err = xfrm_init_replay(x);
OpenPOWER on IntegriCloud