Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6236af69 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: validate NFTA_SET_ELEM_OBJREF based on NFT_SET_OBJECT flag 



[ 5a2f3dc31811e93be15522d9eb13ed61460b76c8 ]

If the NFTA_SET_ELEM_OBJREF netlink attribute is present and
NFT_SET_OBJECT flag is set on, report EINVAL.

Move existing sanity check earlier to validate that NFT_SET_OBJECT
requires NFTA_SET_ELEM_OBJREF.

Fixes: 8aeff920 ("netfilter: nf_tables: add stateful object reference to set elements")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 05b4105e

net/netfilter/nf_tables_api.c

+9 −4
Original line number Diff line number Diff line
@@ -4595,6 +4595,15 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, 
			return -EINVAL;

	}



	if (set->flags & NFT_SET_OBJECT) {

		if (!nla[NFTA_SET_ELEM_OBJREF] &&

		    !(flags & NFT_SET_ELEM_INTERVAL_END))

			return -EINVAL;

	} else {

		if (nla[NFTA_SET_ELEM_OBJREF])

			return -EINVAL;

	}



	if ((flags & NFT_SET_ELEM_INTERVAL_END) &&

	     (nla[NFTA_SET_ELEM_DATA] ||

	      nla[NFTA_SET_ELEM_OBJREF] ||
@@ -4639,10 +4648,6 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, 
	}



	if (nla[NFTA_SET_ELEM_OBJREF] != NULL) {

		if (!(set->flags & NFT_SET_OBJECT)) {

			err = -EINVAL;

			goto err2;

		}

		obj = nft_obj_lookup(ctx->net, ctx->table,

				     nla[NFTA_SET_ELEM_OBJREF],

				     set->objtype, genmask);