bpf: Fix hashtab overflow check on 32-bit arches
authorToke Høiland-Jørgensen <toke@redhat.com>
Thu, 7 Mar 2024 12:03:36 +0000 (13:03 +0100)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 8 Mar 2024 04:05:56 +0000 (20:05 -0800)
commit6787d916c2cf9850c97a0a3f73e08c43e7d973b1
tree4507c251124f0b366db3aeaa34baa51fac562d67
parent281d464a34f540de166cee74b723e97ac2515ec3
bpf: Fix hashtab overflow check on 32-bit arches

The hashtab code relies on roundup_pow_of_two() to compute the number of
hash buckets, and contains an overflow check by checking if the
resulting value is 0. However, on 32-bit arches, the roundup code itself
can overflow by doing a 32-bit left-shift of an unsigned long value,
which is undefined behaviour, so it is not guaranteed to truncate
neatly. This was triggered by syzbot on the DEVMAP_HASH type, which
contains the same check, copied from the hashtab code. So apply the same
fix to hashtab, by moving the overflow check to before the roundup.

Fixes: daaf427c6ab3 ("bpf: fix arraymap NULL deref and missing overflow and zero size checks")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Message-ID: <20240307120340.99577-3-toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/hashtab.c