netfilter: nf_tables: Avoid duplicate call to nft_data_uninit() for same key

nft_del_setelem() currently calls nft_data_uninit() twice on the same
key. Once to release the key which is guaranteed to be NFT_DATA_VALUE
and a second time in the error path to which it falls through.

The second call has been harmless so far though because the type
passed is always NFT_DATA_VALUE which is currently a no-op.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 8746ff9a83571d97b3991dced7ad3f968c15bdfa..b35ba833e13c46cb645f668a8dc9001b9384f141 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -3218,6 +3218,7 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
        if (set->flags & NFT_SET_MAP)
                nft_data_uninit(&elem.data, set->dtype);
 
+       return 0;
 err2:
        nft_data_uninit(&elem.key, desc.type);
 err1: