Skip to content

Commit ea62d16

Browse files
ummakynesgregkh
authored andcommitted
netfilter: nf_tables: disallow non-stateful expression in sets earlier
commit 5207780 upstream. Since 3e135cd ("netfilter: nft_dynset: dynamic stateful expression instantiation"), it is possible to attach stateful expressions to set elements. cd5125d ("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: 0b2d8a7 ("netfilter: nf_tables: add helper functions for expression handling") Reported-and-tested-by: Aaron Adams <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5525af1 commit ea62d16

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2679,27 +2679,31 @@ static struct nft_expr *nft_expr_init(const struct nft_ctx *ctx,
26792679

26802680
err = nf_tables_expr_parse(ctx, nla, &info);
26812681
if (err < 0)
2682-
goto err1;
2682+
goto err_expr_parse;
2683+
2684+
err = -EOPNOTSUPP;
2685+
if (!(info.ops->type->flags & NFT_EXPR_STATEFUL))
2686+
goto err_expr_stateful;
26832687

26842688
err = -ENOMEM;
26852689
expr = kzalloc(info.ops->size, GFP_KERNEL);
26862690
if (expr == NULL)
2687-
goto err2;
2691+
goto err_expr_stateful;
26882692

26892693
err = nf_tables_newexpr(ctx, &info, expr);
26902694
if (err < 0)
2691-
goto err3;
2695+
goto err_expr_new;
26922696

26932697
return expr;
2694-
err3:
2698+
err_expr_new:
26952699
kfree(expr);
2696-
err2:
2700+
err_expr_stateful:
26972701
owner = info.ops->type->owner;
26982702
if (info.ops->type->release_ops)
26992703
info.ops->type->release_ops(info.ops);
27002704

27012705
module_put(owner);
2702-
err1:
2706+
err_expr_parse:
27032707
return ERR_PTR(err);
27042708
}
27052709

@@ -5055,9 +5059,6 @@ struct nft_expr *nft_set_elem_expr_alloc(const struct nft_ctx *ctx,
50555059
return expr;
50565060

50575061
err = -EOPNOTSUPP;
5058-
if (!(expr->ops->type->flags & NFT_EXPR_STATEFUL))
5059-
goto err_set_elem_expr;
5060-
50615062
if (expr->ops->type->flags & NFT_EXPR_GC) {
50625063
if (set->flags & NFT_SET_TIMEOUT)
50635064
goto err_set_elem_expr;

0 commit comments

Comments
 (0)