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 38AC81DF726; Wed, 6 Nov 2024 12:27:16 +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=1730896036; cv=none; b=XlHz+O+lyOQypnAdbhh9uD3w6lIwLt4urFZ45NT55iYya4aMgioLE3WlFYB6vXBddFe60D84gcw9AHGxzGArjTAArTC5pyvg/azJDtRSDsZiAqo4wJfmJAJ1epXtv2iZIOFXe71L4WxqKQkfxSltNkWWIyLcPVJNs+uJOv9VEQ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896036; c=relaxed/simple; bh=BSu1+yvOw48dEJx6aC6LBHk+uIiwrXFljWQXzBFGeVE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i3dkRQRPfc7XyqaDhO9Mp+JApqIEArah1MpO0SLcELdJBDn0qOsRYR+bXJhcUESzXJOqgiDUngsg2lUULz6lI9D+My4B38C5kalAbNKAP3Lnswu4umNuncGVdCC7P5/8fhs0vLOOwAIuEUf6hcs0iLN60EvNLke720m/93V5yHY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vZ3ST+vn; 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="vZ3ST+vn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0283C4CECD; Wed, 6 Nov 2024 12:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730896036; bh=BSu1+yvOw48dEJx6aC6LBHk+uIiwrXFljWQXzBFGeVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vZ3ST+vnu4Z2m46WKc+atvcJUHQcsQG4xTYyz0RVUngkS879Oi401WjuQBuU8eASz A7cEl5tGtS3ujyvyFHsbiOjOtm2l6apahk8bg/hPOh2buHe3TemkcbU/eZJknSN7En ssM2bzHiHS8C1FaV+X1cMgg7UzTTMkuDubyO29n4= 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.11 041/245] bpf: Fix out-of-bounds write in trie_get_next_key() Date: Wed, 6 Nov 2024 13:01:34 +0100 Message-ID: <20241106120320.236464929@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120319.234238499@linuxfoundation.org> References: <20241106120319.234238499@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.11-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 0218a5132ab56..9b60eda0f727b 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.0