Skip to content

Commit 7ec98ef

Browse files
authored
Fix: Prevent out-of-bounds read in mi_ctz_generic32 and mi_clz_generic32
This patch ensures that both mi_ctz_generic32 and mi_clz_generic32 perform safe indexing into the de Bruijn lookup tables by masking the computed index with `& 31`. On platforms where unsigned long is 64-bit, the result of the de Bruijn multiplication and shift could exceed the valid index range (0–31), leading to an out-of-bounds read. This change applies a bitwise AND mask to the final index: - `mi_ctz_generic32`: debruijn[(((x & -(int32_t)x) * 0x077CB531U) >> 27) & 31] - `mi_clz_generic32`: debruijn[((x * 0x07C4ACDDU) >> 27) & 31] This matches the fix applied in python/cpython#134070 to its integrated mimalloc copy. Fixes: python/cpython#134070
1 parent af21001 commit 7ec98ef

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

‎include/mimalloc/internal.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,8 @@ static inline size_t mi_ctz_generic32(uint32_t x) {
976976
31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
977977
};
978978
if (x==0) return 32;
979-
return debruijn[(uint32_t)((x & -(int32_t)x) * (uint32_t)(0x077CB531U)) >> 27];
979+
return debruijn[(((x & -(int32_t)x) * 0x077CB531U) >> 27) & 31];
980+
980981
}
981982

982983
static inline size_t mi_clz_generic32(uint32_t x) {
@@ -991,7 +992,8 @@ static inline size_t mi_clz_generic32(uint32_t x) {
991992
x |= x >> 4;
992993
x |= x >> 8;
993994
x |= x >> 16;
994-
return debruijn[(uint32_t)(x * (uint32_t)(0x07C4ACDDU)) >> 27];
995+
return debruijn[((x * 0x07C4ACDDU) >> 27) & 31];
996+
995997
}
996998

997999
static inline size_t mi_ctz(size_t x) {

0 commit comments

Comments
 (0)