]> git.baikalelectronics.ru Git - kernel.git/commitdiff
netfilter: nf_tables: fix null deref due to zeroed list head
authorFlorian Westphal <fw@strlen.de>
Tue, 9 Aug 2022 16:34:02 +0000 (18:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:17:27 +0000 (11:17 +0200)
commit bbad49a3ba856ab11b974aa027c57e4ecd3c9dac upstream.

In nf_tables_updtable, if nf_tables_table_enable returns an error,
nft_trans_destroy is called to free the transaction object.

nft_trans_destroy() calls list_del(), but the transaction was never
placed on a list -- the list head is all zeroes, this results in
a null dereference:

BUG: KASAN: null-ptr-deref in nft_trans_destroy+0x26/0x59
Call Trace:
 nft_trans_destroy+0x26/0x59
 nf_tables_newtable+0x4bc/0x9bc
 [..]

Its sane to assume that nft_trans_destroy() can be called
on the transaction object returned by nft_trans_alloc(), so
make sure the list head is initialised.

Fixes: 70acafd59c8d ("netfilter: nf_tables: use new transaction infrastructure to handle table")
Reported-by: mingi cho <mgcho.minic@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/netfilter/nf_tables_api.c

index 2a0bda8d3a37d66725d1b6adb16e8cca1d1fa867..3f72e31b1c7f7f40fb8bc45901268abb22c1eb56 100644 (file)
@@ -113,6 +113,7 @@ static struct nft_trans *nft_trans_alloc_gfp(const struct nft_ctx *ctx,
        if (trans == NULL)
                return NULL;
 
+       INIT_LIST_HEAD(&trans->list);
        trans->msg_type = msg_type;
        trans->ctx      = *ctx;