Skip to content

Fix GWP-ASan usable-size expectation #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Matthew Parkinson (mjp41) merged 3 commits into from
Sep 18, 2026
Merged

Fix GWP-ASan usable-size expectation #882

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2baa7b4
Fix GWP-ASan usable-size expectation
mjp41 Sep 17, 2026
a27f95a
Relax secondary usable-size check
mjp41 Sep 17, 2026
a7fdb08
Simplify malloc usable-size checks
mjp41 Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/test/func/malloc/malloc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ void check_result(size_t size, size_t align, void* p, int err, bool null)
failed = true;
}
const auto alloc_size = testlib_malloc_usable_size(p);
auto expected_size = testlib_malloc_good_size(size);
const auto exact_size = align == 1;
const auto exact_size = snmalloc::is_owned(p) && (align == 1);
#ifdef __CHERI_PURE_CAPABILITY__
const auto cheri_size = __builtin_cheri_length_get(p);
if (cheri_size != alloc_size && (size != 0))
Expand Down Expand Up @@ -60,18 +59,20 @@ void check_result(size_t size, size_t align, void* p, int err, bool null)
}
}
#endif
if (exact_size && (alloc_size != expected_size) && (size != 0))
if (exact_size && (size != 0))
{
INFO(
"Usable size is {}, but required to be {}.", alloc_size, expected_size);
failed = true;
const auto expected_size = testlib_malloc_good_size(size);
if (alloc_size != expected_size)
{
INFO(
"Usable size is {}, but required to be {}.", alloc_size, expected_size);
failed = true;
}
}
if ((!exact_size) && (alloc_size < expected_size))
if ((!exact_size) && (alloc_size < size))
{
INFO(
"Usable size is {}, but required to be at least {}.",
alloc_size,
expected_size);
"Usable size is {}, but required to be at least {}.", alloc_size, size);
failed = true;
}
if (((address_cast(p) % align) != 0) && (size != 0))
Expand Down
Loading