Skip to contentSkip to conversation

nft_set_pipapo: Actually validate intervals in fields after the first one

PATCH Applied Stefano Brivio 2 participants 2 messages Nov 24, 2022 – Nov 28, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nft_set_pipapo: Actually validate intervals in fields after the first one

Embarrassingly, nft_pipapo_insert() checked for interval validity in the first field only.

The start_p and end_p pointers were reset to key data from the first field at every iteration of the loop which was supposed to go over the set fields.

Fixes 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
---
 net/netfilter/nft_set_pipapo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nft_set_pipapo.c +3 -2
index 4f9299b9dcdd..06d46d182634 100644
@@ -1162,6 +1162,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
 	struct nft_pipapo_match *m = priv->clone;
 	u8 genmask = nft_genmask_next(net);
 	struct nft_pipapo_field *f;
+	const u8 *start_p, *end_p;
 	int i, bsize_max, err = 0;
 
 	if (nft_set_ext_exists(ext, NFT_SET_EXT_KEY_END))
@@ -1202,9 +1203,9 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
 	}
 
 	/* Validate */
+	start_p = start;
+	end_p = end;
 	nft_pipapo_for_each_field(f, i, m) {
-		const u8 *start_p = start, *end_p = end;
-
 		if (f->rules >= (unsigned long)NFT_PIPAPO_RULE0_MAX)
 			return -ENOSPC;
 
Signature · 1 line
2.35.1
maintainer Applied
#1 lore raw
Quoted 6 lines · Stefano Brivio

Embarrassingly, nft_pipapo_insert() checked for interval validity in the first field only.

The start_p and end_p pointers were reset to key data from the first field at every iteration of the loop which was supposed to go over the set fields.

Applied to nf, thanks