]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: Fix DEVMAP_HASH overflow check on 32-bit arches
authorToke Høiland-Jørgensen <toke@redhat.com>
Thu, 7 Mar 2024 12:03:35 +0000 (13:03 +0100)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:52 +0000 (18:21 -0400)
commit225da02acdc97af01b6bc6ce1a3e5362bf01d3fb
tree3267e00b6a4d18385bbf5d83b7fda68c2167125c
parent70294d8bc31f3b7789e5e32f757aa9344556d964
bpf: Fix DEVMAP_HASH overflow check on 32-bit arches

[ Upstream commit 281d464a34f540de166cee74b723e97ac2515ec3 ]

The devmap code allocates a number hash buckets equal to the next power
of two of the max_entries value provided when creating the map. When
rounding up to the next power of two, the 32-bit variable storing the
number of buckets can overflow, and the code checks for overflow by
checking if the truncated 32-bit value is equal to 0. However, on 32-bit
arches the rounding up itself can overflow mid-way through, because it
ends up doing a left-shift of 32 bits on an unsigned long value. If the
size of an unsigned long is four bytes, this is undefined behaviour, so
there is no guarantee that we'll end up with a nice and tidy 0-value at
the end.

Syzbot managed to turn this into a crash on arm32 by creating a
DEVMAP_HASH with max_entries > 0x80000000 and then trying to update it.
Fix this by moving the overflow check to before the rounding up
operation.

Fixes: 6f9d451ab1a3 ("xdp: Add devmap_hash map type for looking up devices by hashed index")
Link: https://lore.kernel.org/r/000000000000ed666a0611af6818@google.com
Reported-and-tested-by: syzbot+8cd36f6b65f3cafd400a@syzkaller.appspotmail.com
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Message-ID: <20240307120340.99577-2-toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/bpf/devmap.c