3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-01-14 01:08:01 +08:00
Code Issues Projects Releases Wiki Activity

ios: Add fallbacks to try_free_default and claimed_address in forbidden allocators.

Browse Source 
This test only change should improve flake on iOS XCUITests. try_free_default can receive a pointer which doesn't belong to the
allocator and claimed_address may not be implemented in specified zone.
Add fallbacks for both.

This logic is identical to the Chromium equivalent shim in
base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc

Bug:b/270620301
Change-Id: I4a788d4fbc7b324caff18e41618a5f999b4b8d4e
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4549684
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Justin Cohen 2023-05-19 23:55:11 -04:00 committed by Justin Cohen
parent 8525d5384e
commit 1103dfc65d
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
test/ios/host/handler_forbidden_allocators.cc
View File

@ -151,10 +151,46 @@ boolean_t handler_forbidden_claimed_address(struct _malloc_zone_t* zone,
"handler_forbidden_claimed_address allocator used in handler.");
exit(EXIT_FAILURE);
}
return g_old_zone.claimed_address(zone, ptr);
if (g_old_zone.claimed_address) {
return g_old_zone.claimed_address(zone, ptr);
}
// If the fast API 'claimed_address' is not implemented in the specified zone,
// fall back to 'size' function, which also tells whether the given address
// belongs to the zone or not although it'd be slow.
return g_old_zone.size(zone, ptr);
}
#if defined(__IPHONE_16_1) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_1
// The fallback function to be called when try_free_default_function receives a
// pointer which doesn't belong to the allocator.
void TryFreeDefaultFallbackToFindZoneAndFree(void* ptr) {
unsigned int zone_count = 0;
vm_address_t* zones = nullptr;
kern_return_t result =
malloc_get_all_zones(mach_task_self(), nullptr, &zones, &zone_count);
MACH_CHECK(result == KERN_SUCCESS, result) << "malloc_get_all_zones";
// "find_zone_and_free" expected by try_free_default.
//
// libmalloc's zones call find_registered_zone() in case the default one
// doesn't handle the allocation. We can't, so we try to emulate it. See the
// implementation in libmalloc/src/malloc.c for details.
// https://github.com/apple-oss-distributions/libmalloc/blob/main/src/malloc.c
for (unsigned int i = 0; i < zone_count; ++i) {
malloc_zone_t* zone = reinterpret_cast<malloc_zone_t*>(zones[i]);
if (size_t size = zone->size(zone, ptr)) {
if (zone->version >= 6 && zone->free_definite_size) {
zone->free_definite_size(zone, ptr, size);
} else {
zone->free(zone, ptr);
}
return;
}
}
}
void handler_forbidden_try_free_default(struct _malloc_zone_t* zone,
void* ptr) {
if (is_handler_thread()) {
@ -162,7 +198,11 @@ void handler_forbidden_try_free_default(struct _malloc_zone_t* zone,
"handler_forbidden_try_free_default allocator used in handler.");
exit(EXIT_FAILURE);
}
g_old_zone.try_free_default(zone, ptr);
if (g_old_zone.try_free_default) {
return g_old_zone.try_free_default(zone, ptr);
}
TryFreeDefaultFallbackToFindZoneAndFree(ptr);
}
#endif