Skip to content

Commit 13400ac

Browse files
byeonguk-jeongAlexei Starovoitov
authored andcommitted
bpf: Fix out-of-bounds write in trie_get_next_key()
trie_get_next_key() allocates a node stack with size trie->max_prefixlen, while it writes (trie->max_prefixlen + 1) nodes to the stack when it has full paths from the root to leaves. For example, consider a trie with max_prefixlen is 8, and the nodes with key 0x00/0, 0x00/1, 0x00/2, ... 0x00/8 inserted. Subsequent calls to trie_get_next_key with _key with .prefixlen = 8 make 9 nodes be written on the node stack with size 8. Fixes: b471f2f ("bpf: implement MAP_GET_NEXT_KEY command for LPM_TRIE map") Signed-off-by: Byeonguk Jeong <[email protected]> Reviewed-by: Toke Høiland-Jørgensen <[email protected]> Tested-by: Hou Tao <[email protected]> Acked-by: Hou Tao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 1fb3158 commit 13400ac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/bpf/lpm_trie.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ static int trie_get_next_key(struct bpf_map *map, void *_key, void *_next_key)
655655
if (!key || key->prefixlen > trie->max_prefixlen)
656656
goto find_leftmost;
657657

658-
node_stack = kmalloc_array(trie->max_prefixlen,
658+
node_stack = kmalloc_array(trie->max_prefixlen + 1,
659659
sizeof(struct lpm_trie_node *),
660660
GFP_ATOMIC | __GFP_NOWARN);
661661
if (!node_stack)

0 commit comments

Comments
 (0)