Commit 3701cd39 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

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: 48b0ae04 ("netfilter: nftables: netlink support for several set element expressions")
Reported-by: default avatarXingyuan Mo <hdthky0@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 63331e37

net/netfilter/nft_dynset.c

+9 −4
Original line number Diff line number Diff line
@@ -280,11 +280,16 @@ static int nft_dynset_init(const struct nft_ctx *ctx, 
			priv->expr_array[i] = dynset_expr;

			priv->num_exprs++;



			if (set->num_exprs &&

			    dynset_expr->ops != set->exprs[i]->ops) {

			if (set->num_exprs) {

				if (i >= set->num_exprs) {

					err = -EINVAL;

					goto err_expr_free;

				}

				if (dynset_expr->ops != set->exprs[i]->ops) {

					err = -EOPNOTSUPP;

					goto err_expr_free;

				}

			}

			i++;

		}

		if (set->num_exprs && set->num_exprs != i) {