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

netfilter: nf_tables: do not update stateful expressions if lookup is inverted 



Initialize set lookup matching element to NULL. Otherwise, the
NFT_LOOKUP_F_INV flag reverses the matching logic and it leads to
deference an uninitialized pointer to the matching element. Make sure
element data area and stateful expression are accessed if there is a
matching set element.

This patch undoes 24791b9a ("netfilter: nft_set_bitmap: initialize set
element extension in lookups") which is not required anymore.

Fixes: 339706bc ("netfilter: nft_lookup: update element stateful expression")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 72239f27

include/net/netfilter/nf_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static inline void nft_set_elem_update_expr(const struct nft_set_ext *ext, 
{

	struct nft_expr *expr;



	if (nft_set_ext_exists(ext, NFT_SET_EXT_EXPR)) {

	if (__nft_set_ext_exists(ext, NFT_SET_EXT_EXPR)) {

		expr = nft_set_ext_expr(ext);

		expr->ops->eval(expr, regs, pkt);

	}

net/netfilter/nft_lookup.c

+7 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void nft_lookup_eval(const struct nft_expr *expr, 
{

	const struct nft_lookup *priv = nft_expr_priv(expr);

	const struct nft_set *set = priv->set;

	const struct nft_set_ext *ext;

	const struct nft_set_ext *ext = NULL;

	bool found;



	found = set->ops->lookup(nft_net(pkt), set, &regs->data[priv->sreg],
@@ -39,12 +39,14 @@ void nft_lookup_eval(const struct nft_expr *expr, 
		return;

	}



	if (ext) {

		if (set->flags & NFT_SET_MAP)

			nft_data_copy(&regs->data[priv->dreg],

				      nft_set_ext_data(ext), set->dlen);



		nft_set_elem_update_expr(ext, regs, pkt);

	}

}



static const struct nla_policy nft_lookup_policy[NFTA_LOOKUP_MAX + 1] = {

	[NFTA_LOOKUP_SET]	= { .type = NLA_STRING,

net/netfilter/nft_set_bitmap.c

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ static bool nft_bitmap_lookup(const struct net *net, const struct nft_set *set, 
	u32 idx, off;



	nft_bitmap_location(set, key, &idx, &off);

	*ext = NULL;



	return nft_bitmap_active(priv->bitmap, idx, off, genmask);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE