Skip to content

Commit 5c8d8f1

Browse files
Hou Taomehmetb0
authored andcommitted
bpf: Fix exact match conditions in trie_get_next_key()
BugLink: https://bugs.launchpad.net/bugs/2095283 [ Upstream commit 27abc7b3fa2e09bbe41e2924d328121546865eda ] trie_get_next_key() uses node->prefixlen == key->prefixlen to identify an exact match, However, it is incorrect because when the target key doesn't fully match the found node (e.g., node->prefixlen != matchlen), these two nodes may also have the same prefixlen. It will return expected result when the passed key exist in the trie. However when a recently-deleted key or nonexistent key is passed to trie_get_next_key(), it may skip keys and return incorrect result. Fix it by using node->prefixlen == matchlen to identify exact matches. When the condition is true after the search, it also implies node->prefixlen equals key->prefixlen, otherwise, the search would return NULL instead. Fixes: b471f2f ("bpf: implement MAP_GET_NEXT_KEY command for LPM_TRIE map") Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com> Signed-off-by: Hou Tao <houtao1@huawei.com> Link: https://lore.kernel.org/r/20241206110622.1161752-6-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
1 parent 8cad50b commit 5c8d8f1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/bpf/lpm_trie.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ static int trie_get_next_key(struct bpf_map *map, void *_key, void *_next_key)
639639
struct lpm_trie_node **node_stack = NULL;
640640
int err = 0, stack_ptr = -1;
641641
unsigned int next_bit;
642-
size_t matchlen;
642+
size_t matchlen = 0;
643643

644644
/* The get_next_key follows postorder. For the 4 node example in
645645
* the top of this file, the trie_get_next_key() returns the following
@@ -678,7 +678,7 @@ static int trie_get_next_key(struct bpf_map *map, void *_key, void *_next_key)
678678
next_bit = extract_bit(key->data, node->prefixlen);
679679
node = rcu_dereference(node->child[next_bit]);
680680
}
681-
if (!node || node->prefixlen != key->prefixlen ||
681+
if (!node || node->prefixlen != matchlen ||
682682
(node->flags & LPM_TREE_NODE_FLAG_IM))
683683
goto find_leftmost;
684684

0 commit comments

Comments
 (0)