Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: nf_tables: disallow non-stateful expression in sets earlier

Since 3e135cd499bf ("netfilter: nft_dynset: dynamic stateful expression
instantiation"), it is possible to attach stateful expressions to set
elements.

cd5125d8f518 ("netfilter: nf_tables: split set destruction in deactivate
and destroy phase") introduces conditional destruction on the object to
accomodate transaction semantics.

nft_expr_init() calls expr->ops->init() first, then check for
NFT_STATEFUL_EXPR, this stills allows to initialize a non-stateful
lookup expressions which points to a set, which might lead to UAF since
the set is not properly detached from the set->binding for this case.
Anyway, this combination is non-sense from nf_tables perspective.

This patch fixes this problem by checking for NFT_STATEFUL_EXPR before
expr->ops->init() is called.

The reporter provides a KASAN splat and a poc reproducer (similar to
those autogenerated by syzbot to report use-after-free errors). It is
unknown to me if they are using syzbot or if they use similar automated
tool to locate the bug that they are reporting.

For the record, this is the KASAN splat.

[ 85.431824] ==================================================================
[ 85.432901] BUG: KASAN: use-after-free in nf_tables_bind_set+0x81b/0xa20
[ 85.433825] Write of size 8 at addr ffff8880286f0e98 by task poc/776
[ 85.434756]
[ 85.434999] CPU: 1 PID: 776 Comm: poc Tainted: G W 5.18.0+ #2
[ 85.436023] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014

Fixes: 0b2d8a7b638b ("netfilter: nf_tables: add helper functions for expression handling")
Reported-and-tested-by: Aaron Adams <edg-e@nccgroup.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

+10 -9
+10 -9
net/netfilter/nf_tables_api.c
··· 2873 2873 2874 2874 err = nf_tables_expr_parse(ctx, nla, &expr_info); 2875 2875 if (err < 0) 2876 - goto err1; 2876 + goto err_expr_parse; 2877 + 2878 + err = -EOPNOTSUPP; 2879 + if (!(expr_info.ops->type->flags & NFT_EXPR_STATEFUL)) 2880 + goto err_expr_stateful; 2877 2881 2878 2882 err = -ENOMEM; 2879 2883 expr = kzalloc(expr_info.ops->size, GFP_KERNEL_ACCOUNT); 2880 2884 if (expr == NULL) 2881 - goto err2; 2885 + goto err_expr_stateful; 2882 2886 2883 2887 err = nf_tables_newexpr(ctx, &expr_info, expr); 2884 2888 if (err < 0) 2885 - goto err3; 2889 + goto err_expr_new; 2886 2890 2887 2891 return expr; 2888 - err3: 2892 + err_expr_new: 2889 2893 kfree(expr); 2890 - err2: 2894 + err_expr_stateful: 2891 2895 owner = expr_info.ops->type->owner; 2892 2896 if (expr_info.ops->type->release_ops) 2893 2897 expr_info.ops->type->release_ops(expr_info.ops); 2894 2898 2895 2899 module_put(owner); 2896 - err1: 2900 + err_expr_parse: 2897 2901 return ERR_PTR(err); 2898 2902 } 2899 2903 ··· 5417 5413 return expr; 5418 5414 5419 5415 err = -EOPNOTSUPP; 5420 - if (!(expr->ops->type->flags & NFT_EXPR_STATEFUL)) 5421 - goto err_set_elem_expr; 5422 - 5423 5416 if (expr->ops->type->flags & NFT_EXPR_GC) { 5424 5417 if (set->flags & NFT_SET_TIMEOUT) 5425 5418 goto err_set_elem_expr;