From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85EA91E008B; Wed, 6 Nov 2024 12:49:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897376; cv=none; b=Sp9WXnmv0+Z1xFamxh59GgqYMsxOJZlGYdTdJT0z4R0rRh78S4AFDRSDLDSCwfZLHEWwYM5O2BKpJ1XoQT91jwWadlix46Qi+URqTXKcPFLjuY6BsgU1YayXRUQNNrp17JFzXNxL2fe2ooFknKtHa1W0K6U/p9+wulECKglh5FU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897376; c=relaxed/simple; bh=bHuyH6LdK209xOYfQeKUwzEk812+hoGN5Wcziom3X4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aizMz9AQ/hSBtp07NLleRcNn2clpc+ZXyqDcQQKgRXva5BC7vcUBeWMmUmJ3eY6NMwzdm0hTtb7aOvndbpl87BLvrYaJkd/q8iaHlKsRVzEXptMyR1y9s34gHTvuVq0SGk1xbPTrAz42vO4auIu2/VftxM9huc/dNQ4OH6/HOOs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M8fe+68C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="M8fe+68C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B23FAC4CECD; Wed, 6 Nov 2024 12:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730897376; bh=bHuyH6LdK209xOYfQeKUwzEk812+hoGN5Wcziom3X4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M8fe+68C5MKuDebG0Vtf5PJ+xXcF0KnE1zxIcPhqc2b3Vsk/p7zStUjOhMVxmrN8z V3dA6qTDMCuQn9Ia8aadHQPwoXSlBQ6TUF/C3KkSeeXpCvOoUUqt00kcOQ5NmdOv7K fRtrGUpyfdJR0nCsRGIMGR3O3QRZWQKxnfGxIgQQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Byeonguk Jeong , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Hou Tao , Alexei Starovoitov , Sasha Levin Subject: [PATCH 6.6 031/151] bpf: Fix out-of-bounds write in trie_get_next_key() Date: Wed, 6 Nov 2024 13:03:39 +0100 Message-ID: <20241106120309.694468735@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120308.841299741@linuxfoundation.org> References: <20241106120308.841299741@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Byeonguk Jeong [ Upstream commit 13400ac8fb80c57c2bfb12ebd35ee121ce9b4d21 ] 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 Reviewed-by: Toke Høiland-Jørgensen Tested-by: Hou Tao Acked-by: Hou Tao Link: https://lore.kernel.org/r/Zxx384ZfdlFYnz6J@localhost.localdomain Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- 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 d0febf07051ed..daf8ffcfcdac4 100644 --- a/kernel/bpf/lpm_trie.c +++ b/kernel/bpf/lpm_trie.c @@ -647,7 +647,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.0