summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-08-07 14:49:08 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-08-08 16:47:29 +0200
commit609ccf087747de48ef52160f93e0df864c532a61 (patch)
treec92ba96fbb0b9879afb6f8d9e93866438761ae59 /net
parent7926dbfa4bc14e27f4e18a6184a031a1c1e077dc (diff)
downloadblackbird-op-linux-609ccf087747de48ef52160f93e0df864c532a61.tar.gz
blackbird-op-linux-609ccf087747de48ef52160f93e0df864c532a61.zip
netfilter: nf_tables: fix error return code
Convert a zero return value on error to a negative one, as returned elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier ret; expression e1,e2; @@ ( if (\(ret < 0\|ret != 0\)) { ... return ret; } | ret = 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: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_tables_api.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 9aa31f11056d..deeb95fb7028 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -3137,8 +3137,10 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
goto err2;
trans = nft_trans_elem_alloc(ctx, NFT_MSG_DELSETELEM, set);
- if (trans == NULL)
+ if (trans == NULL) {
+ err = -ENOMEM;
goto err2;
+ }
nft_trans_elem(trans) = elem;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
OpenPOWER on IntegriCloud