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

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

ea3cf8101c0d ("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: 29610df11a8f ("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>

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 12fc9cda4a2cffcc387c0500b4347c4dc631a0e7..f296dfe86b6225849f55fc6b51e58ed91d14a65b 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2873,27 +2873,31 @@ static struct nft_expr *nft_expr_init(const struct nft_ctx *ctx,
 
        err = nf_tables_expr_parse(ctx, nla, &expr_info);
        if (err < 0)
-               goto err1;
+               goto err_expr_parse;
+
+       err = -EOPNOTSUPP;
+       if (!(expr_info.ops->type->flags & NFT_EXPR_STATEFUL))
+               goto err_expr_stateful;
 
        err = -ENOMEM;
        expr = kzalloc(expr_info.ops->size, GFP_KERNEL_ACCOUNT);
        if (expr == NULL)
-               goto err2;
+               goto err_expr_stateful;
 
        err = nf_tables_newexpr(ctx, &expr_info, expr);
        if (err < 0)
-               goto err3;
+               goto err_expr_new;
 
        return expr;
-err3:
+err_expr_new:
        kfree(expr);
-err2:
+err_expr_stateful:
        owner = expr_info.ops->type->owner;
        if (expr_info.ops->type->release_ops)
                expr_info.ops->type->release_ops(expr_info.ops);
 
        module_put(owner);
-err1:
+err_expr_parse:
        return ERR_PTR(err);
 }
 
@@ -5413,9 +5417,6 @@ struct nft_expr *nft_set_elem_expr_alloc(const struct nft_ctx *ctx,
                return expr;
 
        err = -EOPNOTSUPP;
-       if (!(expr->ops->type->flags & NFT_EXPR_STATEFUL))
-               goto err_set_elem_expr;
-
        if (expr->ops->type->flags & NFT_EXPR_GC) {
                if (set->flags & NFT_SET_TIMEOUT)
                        goto err_set_elem_expr;