Commit bffc124b authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: validate NFT_SET_ELEM_INTERVAL_END 



Only NFTA_SET_ELEM_KEY and NFTA_SET_ELEM_FLAGS make sense for elements
whose NFT_SET_ELEM_INTERVAL_END flag is set on.

Fixes: 96518518 ("netfilter: add nftables")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent db3b665d

net/netfilter/nf_tables_api.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -4756,14 +4756,20 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, 
		if (nla[NFTA_SET_ELEM_DATA] == NULL &&

		if (nla[NFTA_SET_ELEM_DATA] == NULL &&

		    !(flags & NFT_SET_ELEM_INTERVAL_END))

		    !(flags & NFT_SET_ELEM_INTERVAL_END))

			return -EINVAL;

			return -EINVAL;

		if (nla[NFTA_SET_ELEM_DATA] != NULL &&

		    flags & NFT_SET_ELEM_INTERVAL_END)

			return -EINVAL;

	} else {

	} else {

		if (nla[NFTA_SET_ELEM_DATA] != NULL)

		if (nla[NFTA_SET_ELEM_DATA] != NULL)

			return -EINVAL;

			return -EINVAL;

	}

	}





	if ((flags & NFT_SET_ELEM_INTERVAL_END) &&

	     (nla[NFTA_SET_ELEM_DATA] ||

	      nla[NFTA_SET_ELEM_OBJREF] ||

	      nla[NFTA_SET_ELEM_TIMEOUT] ||

	      nla[NFTA_SET_ELEM_EXPIRATION] ||

	      nla[NFTA_SET_ELEM_USERDATA] ||

	      nla[NFTA_SET_ELEM_EXPR]))

		return -EINVAL;



	timeout = 0;

	timeout = 0;

	if (nla[NFTA_SET_ELEM_TIMEOUT] != NULL) {

	if (nla[NFTA_SET_ELEM_TIMEOUT] != NULL) {

		if (!(set->flags & NFT_SET_TIMEOUT))

		if (!(set->flags & NFT_SET_TIMEOUT))

CRA Git | Maintained and supported by SUSTech CRA and CCSE