]> git.baikalelectronics.ru Git - kernel.git/commitdiff
netfilter: nf_tables: destroy the set if fail to add transaction
authorLiping Zhang <zlpnobody@gmail.com>
Sat, 29 Oct 2016 14:03:05 +0000 (22:03 +0800)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 31 Oct 2016 12:17:29 +0000 (13:17 +0100)
When the memory is exhausted, then we will fail to add the NFT_MSG_NEWSET
transaction. In such case, we should destroy the set before we free it.

Fixes: dc63100f750d ("netfilter: nf_tables: use new transaction infrastructure to handle sets")
Signed-off-by: Liping Zhang <zlpnobody@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_tables_api.c

index 365d31b8681672ee5c97fc456a1d16885d9ebd00..7d6a626b08f17d04c5192f25b58c078d84fe8a3b 100644 (file)
@@ -2956,12 +2956,14 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,
 
        err = nft_trans_set_add(&ctx, NFT_MSG_NEWSET, set);
        if (err < 0)
-               goto err2;
+               goto err3;
 
        list_add_tail_rcu(&set->list, &table->sets);
        table->use++;
        return 0;
 
+err3:
+       ops->destroy(set);
 err2:
        kfree(set);
 err1: