From: Thomas Graf Date: Fri, 1 Aug 2014 15:25:38 +0000 (+0200) Subject: netfilter: nf_tables: Avoid duplicate call to nft_data_uninit() for same key X-Git-Tag: v3.17-rc1~106^2^2~7^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0dc1362562a2e8b82a6be8d3ae307a234f28f9bc;p=platform%2Fkernel%2Flinux-exynos.git 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 Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 8746ff9..b35ba83 100644 --- 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: