NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: nf_tables: bail out on mismatching dynset and set expressions

Browse source 
[ Upstream commit 3701cd390fd731ee7ae8b8006246c8db82c72bea ]

If dynset expressions provided by userspace is larger than the declared
set expressions, then bail out.

Fixes: 48b0ae046e ("netfilter: nftables: netlink support for several set element expressions")
Reported-by: Xingyuan Mo <hdthky0@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pablo Neira Ayuso 2023-12-04 14:25:33 +01:00 • committed by Greg Kroah-Hartman
parent c9704c2619
commit 96f8654b70
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
net/netfilter/nft_dynset.c
View file

@ -279,10 +279,15 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
priv->expr_array[i] = dynset_expr; priv->expr_array[i] = dynset_expr;
priv->num_exprs++; priv->num_exprs++;
if (set->num_exprs && if (set->num_exprs) {
dynset_expr->ops != set->exprs[i]->ops) { if (i >= set->num_exprs) {
err = -EOPNOTSUPP; err = -EINVAL;
goto err_expr_free; goto err_expr_free;
}
if (dynset_expr->ops != set->exprs[i]->ops) {
err = -EOPNOTSUPP;
goto err_expr_free;
}
} }
i++; i++;
} }