Skip to contentSkip to conversation

netfilter: nft_set_bitmap: initialize set element extension in lookups

PATCH New Pablo Neira Ayuso 1 participant 3 messages Mar 27, 2020

Subsystems (2)
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/3 netfilter: nft_set_bitmap: initialize set element extension in lookups

Otherwise, nft_lookup might dereference an uninitialized pointer to the element extension.

Fixes 665153ff5752 ("netfilter: nf_tables: add bitmap set type")
---
 net/netfilter/nft_set_bitmap.c | 1 +
 1 file changed, 1 insertion(+)
net/netfilter/nft_set_bitmap.c +1 -0
index 1cb2e67e6e03..6829a497b4cc 100644
@@ -81,6 +81,7 @@ 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);
 }
Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH 2/3 netfilter: nft_dynset: validate set expression definition

If the global set expression definition mismatches the dynset expression, then bail out.

---
 net/netfilter/nft_dynset.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
net/netfilter/nft_dynset.c +7 -2
index d1b64c8de585..64ca13a1885b 100644
@@ -187,6 +187,11 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
 						     tb[NFTA_DYNSET_EXPR]);
 		if (IS_ERR(priv->expr))
 			return PTR_ERR(priv->expr);
+
+		if (set->expr && set->expr->ops != priv->expr->ops) {
+			err = -EOPNOTSUPP;
+			goto err_expr_free;
+		}
 	}
 
 	nft_set_ext_prepare(&priv->tmpl);
@@ -205,7 +210,7 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
 
 	err = nf_tables_bind_set(ctx, set, &priv->binding);
 	if (err < 0)
-		goto err1;
+		goto err_expr_free;
 
 	if (set->size == 0)
 		set->size = 0xffff;
@@ -213,7 +218,7 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
 	priv->set = set;
 	return 0;
 
-err1:
+err_expr_free:
 	if (priv->expr != NULL)
 		nft_expr_destroy(ctx, priv->expr);
 	return err;
Signature · 1 line
2.11.0
author maintainer
#2 lore raw

PATCH 3/3 netfilter: nf_tables: skip set types that do not support for expressions

In reply to Pablo Neira Ayuso

The bitmap set does not support for expressions, skip it from the estimation step.

---
 include/net/netfilter/nf_tables.h | 2 ++
 net/netfilter/nf_tables_api.c     | 3 +++
 net/netfilter/nft_set_bitmap.c    | 2 ++
 3 files changed, 7 insertions(+)
include/net/netfilter/nf_tables.h +2 -0
index 642bc3ef81aa..6eb627b3c99b 100644
@@ -266,6 +266,7 @@ struct nft_set_iter {
  *	@size: number of set elements
  *	@field_len: length of each field in concatenation, bytes
  *	@field_count: number of concatenated fields in element
+ *	@expr: set must support for expressions
  */
 struct nft_set_desc {
 	unsigned int		klen;
@@ -273,6 +274,7 @@ struct nft_set_desc {
 	unsigned int		size;
 	u8			field_len[NFT_REG32_COUNT];
 	u8			field_count;
+	bool			expr;
 };
 
 /**
net/netfilter/nf_tables_api.c +3 -0
index c1e04ac21392..8a73adfab7ff 100644
@@ -4032,6 +4032,9 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,
 			return err;
 	}
 
+	if (nla[NFTA_SET_EXPR])
+		desc.expr = true;
+
 	table = nft_table_lookup(net, nla[NFTA_SET_TABLE], family, genmask);
 	if (IS_ERR(table)) {
 		NL_SET_BAD_ATTR(extack, nla[NFTA_SET_TABLE]);
net/netfilter/nft_set_bitmap.c +2 -0
index 6829a497b4cc..32f0fc8be3a4 100644
@@ -286,6 +286,8 @@ static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,
 	/* Make sure bitmaps we don't get bitmaps larger than 16 Kbytes. */
 	if (desc->klen > 2)
 		return false;
+	else if (desc->expr)
+		return false;
 
 	est->size   = nft_bitmap_total_size(desc->klen);
 	est->lookup = NFT_SET_CLASS_O_1;
Signature · 1 line
2.11.0