Skip to content

Commit 5207780

Browse files
committed
netfilter: nf_tables: disallow non-stateful expression in sets earlier
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]>
1 parent 6c46540 commit 5207780

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
@@ -2873,27 +2873,31 @@ static struct nft_expr *nft_expr_init(const struct nft_ctx *ctx,
28732873

28742874
err = nf_tables_expr_parse(ctx, nla, &expr_info);
28752875
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;
28772881

28782882
err = -ENOMEM;
28792883
expr = kzalloc(expr_info.ops->size, GFP_KERNEL_ACCOUNT);
28802884
if (expr == NULL)
2881-
goto err2;
2885+
goto err_expr_stateful;
28822886

28832887
err = nf_tables_newexpr(ctx, &expr_info, expr);
28842888
if (err < 0)
2885-
goto err3;
2889+
goto err_expr_new;
28862890

28872891
return expr;
2888-
err3:
2892+
err_expr_new:
28892893
kfree(expr);
2890-
err2:
2894+
err_expr_stateful:
28912895
owner = expr_info.ops->type->owner;
28922896
if (expr_info.ops->type->release_ops)
28932897
expr_info.ops->type->release_ops(expr_info.ops);
28942898

28952899
module_put(owner);
2896-
err1:
2900+
err_expr_parse:
28972901
return ERR_PTR(err);
28982902
}
28992903

@@ -5413,9 +5417,6 @@ struct nft_expr *nft_set_elem_expr_alloc(const struct nft_ctx *ctx,
54135417
return expr;
54145418

54155419
err = -EOPNOTSUPP;
5416-
if (!(expr->ops->type->flags & NFT_EXPR_STATEFUL))
5417-
goto err_set_elem_expr;
5418-
54195420
if (expr->ops->type->flags & NFT_EXPR_GC) {
54205421
if (set->flags & NFT_SET_TIMEOUT)
54215422
goto err_set_elem_expr;

0 commit comments

Comments
 (0)