kevin/linux
1
Fork 0
Code

bpf: Fix out-of-bounds write in trie_get_next_key()

Browse Source 
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: b471f2f1de ("bpf: implement MAP_GET_NEXT_KEY command for LPM_TRIE map")
Signed-off-by: Byeonguk Jeong <jungbu2855@gmail.com>
Reviewed-by: Toke Høiland-Jørgensen <toke@kernel.org>
Tested-by: Hou Tao <houtao1@huawei.com>
Acked-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/Zxx384ZfdlFYnz6J@localhost.localdomain
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Byeonguk Jeong 2024-10-26 14:02:43 +09:00 committed by Alexei Starovoitov
parent 1fb315892d
commit 13400ac8fb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/bpf/lpm_trie.c
View File

@ -655,7 +655,7 @@ static int trie_get_next_key(struct bpf_map *map, void *_key, void *_next_key)
if (!key || key->prefixlen > trie->max_prefixlen) if (!key || key->prefixlen > trie->max_prefixlen)
goto find_leftmost; goto find_leftmost;
node_stack = kmalloc_array(trie->max_prefixlen, node_stack = kmalloc_array(trie->max_prefixlen + 1,
sizeof(struct lpm_trie_node *), sizeof(struct lpm_trie_node *),
GFP_ATOMIC | __GFP_NOWARN); GFP_ATOMIC | __GFP_NOWARN);
if (!node_stack) if (!node_stack)