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

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

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

Fixes: 48b0ae046ee9 ("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>

+9 -4
+9 -4
net/netfilter/nft_dynset.c
··· 280 280 priv->expr_array[i] = dynset_expr; 281 281 priv->num_exprs++; 282 282 283 - if (set->num_exprs && 284 - dynset_expr->ops != set->exprs[i]->ops) { 285 - err = -EOPNOTSUPP; 286 - goto err_expr_free; 283 + if (set->num_exprs) { 284 + if (i >= set->num_exprs) { 285 + err = -EINVAL; 286 + goto err_expr_free; 287 + } 288 + if (dynset_expr->ops != set->exprs[i]->ops) { 289 + err = -EOPNOTSUPP; 290 + goto err_expr_free; 291 + } 287 292 } 288 293 i++; 289 294 }