Skip to contentSkip to conversation

netfilter: nft_set_rbtree: reject interval-end get for open intervals

PATCH In review Melbin K Mathew 2 participants 2 messages Jun 30 – Jul 1

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

PATCH 1/1 netfilter: nft_set_rbtree: reject interval-end get for open intervals

nft_rbtree_get() uses the interval endpoint selected by nft_array_get_cmp(). For NFT_SET_ELEM_INTERVAL_END requests, the function uses interval->to to recover struct nft_rbtree_elem.

Open-ended intervals can have a NULL end endpoint. In that case, nft_array_get_cmp() treats the missing endpoint as b = -1, which can still match an interval-end query. Avoid deriving an element pointer from a NULL endpoint and report the element as not found instead.

Return -ENOENT for interval-end requests against open-ended intervals.

Fixes 2aa34191f06f ("netfilter: nft_set_rbtree: use binary search array in get command")

---
Notes:
A reduced userspace model confirms the comparator returns match for a NULL-ended interval when NFT_SET_ELEM_INTERVAL_END is set, and that container_of(NULL, ext) produces a garbage pointer (UBSAN fires).

I have not reproduced an end-to-end crash through normal nft CLI usage. An instrumented WARN in this branch did not fire during interval-set tests with nft add/get/list. The patch is a defensive fix for the NULL endpoint case.

Tested on 7.2-rc1 with KASAN and UBSAN enabled. Function tracing confirms nft_rbtree_get() is reached via nft get element. The added guard returns -ENOENT for a NULL interval endpoint in the instrumented test case.

---
 net/netfilter/nft_set_rbtree.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
net/netfilter/nft_set_rbtree.c +5 -2
index 018bbb6df4..024a2cd3a6 100644
@@ -184,10 +184,13 @@ nft_rbtree_get(const struct net *net, const struct nft_set *set,
 	if (!interval || nft_set_elem_expired(interval->from))
 		return ERR_PTR(-ENOENT);
 
-	if (flags & NFT_SET_ELEM_INTERVAL_END)
+	if (flags & NFT_SET_ELEM_INTERVAL_END) {
+		if (!interval->to)
+			return ERR_PTR(-ENOENT);
 		rbe = container_of(interval->to, struct nft_rbtree_elem, ext);
-	else
+	} else {
 		rbe = container_of(interval->from, struct nft_rbtree_elem, ext);
+	}
 
 	return &rbe->priv;
 }
Signature · 1 line
2.39.5
maintainer
#1 lore raw
Quoted 39 lines · Melbin K Mathew

nft_rbtree_get() uses the interval endpoint selected by nft_array_get_cmp(). For NFT_SET_ELEM_INTERVAL_END requests, the function uses interval->to to recover struct nft_rbtree_elem.

Open-ended intervals can have a NULL end endpoint. In that case, nft_array_get_cmp() treats the missing endpoint as b = -1, which can still match an interval-end query. Avoid deriving an element pointer from a NULL endpoint and report the element as not found instead.

Return -ENOENT for interval-end requests against open-ended intervals.

Fixes 2aa34191f06f ("netfilter: nft_set_rbtree: use binary search array in get command")

---
Notes:
A reduced userspace model confirms the comparator returns match for a NULL-ended interval when NFT_SET_ELEM_INTERVAL_END is set, and that container_of(NULL, ext) produces a garbage pointer (UBSAN fires).

I have not reproduced an end-to-end crash through normal nft CLI usage. An instrumented WARN in this branch did not fire during interval-set tests with nft add/get/list. The patch is a defensive fix for the NULL endpoint case.

Tested on 7.2-rc1 with KASAN and UBSAN enabled. Function tracing confirms nft_rbtree_get() is reached via nft get element. The added guard returns -ENOENT for a NULL interval endpoint in the instrumented test case.

---
 net/netfilter/nft_set_rbtree.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
net/netfilter/nft_set_rbtree.c +0 -0
index 018bbb6df4..024a2cd3a6 100644
@@ -184,10 +184,13 @@ nft_rbtree_get(const struct net *net, const struct nft_set *set,
 	if (!interval || nft_set_elem_expired(interval->from))
 		return ERR_PTR(-ENOENT);

net/netfilter/nft_set_rbtree.c nft_rbtree_get(const struct net *net, const struct nft_set *set, · line 193

Quoted 10 lines
net/netfilter/nft_set_rbtree.c +5 -2
 
-	if (flags & NFT_SET_ELEM_INTERVAL_END)
+	if (flags & NFT_SET_ELEM_INTERVAL_END) {
+		if (!interval->to)
+			return ERR_PTR(-ENOENT);
 		rbe = container_of(interval->to, struct nft_rbtree_elem, ext);
-	else
+	} else {
 		rbe = container_of(interval->from, struct nft_rbtree_elem, ext);
+	}

Hmm, I don't think the query should have returned a match in the first place, i.e. we should have left via (!interval || ... condition.

Pablo, could you please have a look?

I suspect we want something like this:

net/netfilter/nft_set_rbtree.c +5 -3
@@ -150,10 +150,12 @@ static int nft_array_get_cmp(const void *pkey, const void *entry)
 		b = memcmp(ctx->key, nft_set_ext_key(interval->to), ctx->klen);
 
 	if (a >= 0) {
-		if (ctx->flags & NFT_SET_ELEM_INTERVAL_END && b <= 0)
-			return 0;
-		else if (b < 0)
+		if (ctx->flags & NFT_SET_ELEM_INTERVAL_END && b <= 0) {
+			if (interval->to)
+				return 0;
+		} else if (b < 0) {
 			return 0;
+		}
 	}
 
 	if (a < 0)

When userspace asks for end interval, but we have an open interval, then cmp callback shouldn't indicate a match.