All of lore.kernel.org
 help / color / mirror / Atom feed
From: Byeonguk Jeong <jungbu2855@gmail.com>
To: Daniel Borkmann <daniel@iogearbox.net>,
	Yonghong Song <yonghong.song@linux.dev>
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] bpf: Fix out-of-bounds write in trie_get_next_key()
Date: Tue, 22 Oct 2024 10:45:49 +0900	[thread overview]
Message-ID: <ZxcDzT/iv/f0Gyz0@localhost.localdomain> (raw)

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: b471f2f1de8b ("bpf: implement MAP_GET_NEXT_KEY command for LPM_TRIE map")
Signed-off-by: Byeonguk Jeong <jungbu2855@gmail.com>
---
 kernel/bpf/lpm_trie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c
index 0218a5132ab5..9b60eda0f727 100644
--- a/kernel/bpf/lpm_trie.c
+++ b/kernel/bpf/lpm_trie.c
@@ -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)
 		goto find_leftmost;
 
-	node_stack = kmalloc_array(trie->max_prefixlen,
+	node_stack = kmalloc_array(trie->max_prefixlen + 1,
 				   sizeof(struct lpm_trie_node *),
 				   GFP_ATOMIC | __GFP_NOWARN);
 	if (!node_stack)
-- 
2.43.5


             reply	other threads:[~2024-10-22  1:48 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-22  1:45 Byeonguk Jeong [this message]
2024-10-22  9:43 ` [PATCH] bpf: Fix out-of-bounds write in trie_get_next_key() Toke Høiland-Jørgensen
2024-10-22 19:51 ` Alexei Starovoitov
2024-10-23  1:29   ` Byeonguk Jeong
2024-10-23  8:44   ` Byeonguk Jeong
2024-10-23  2:03 ` Hou Tao
2024-10-23  7:30   ` Byeonguk Jeong
2024-10-23  9:59     ` Hou Tao
2024-10-24  1:48       ` Byeonguk Jeong
2024-10-24  3:19         ` Hou Tao
2024-10-24  9:08 ` [PATCH] selftests/bpf: Add test for trie_get_next_key() Byeonguk Jeong
2024-10-24  9:41   ` Daniel Borkmann
2024-10-24 22:26     ` Byeonguk Jeong
2024-10-25 11:54       ` Hou Tao
2024-10-25 12:03         ` Daniel Borkmann
2024-10-25 11:53   ` Hou Tao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZxcDzT/iv/f0Gyz0@localhost.localdomain \
    --to=jungbu2855@gmail.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=yonghong.song@linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.