Loading...
--- libmalloc/libmalloc-657.60.21/tests/xzone_corruption.c
+++ libmalloc/libmalloc-521.100.59/tests/xzone_corruption.c
@@ -25,8 +25,11 @@
return chunk_a == chunk_b;
}
-static void
-test_freelist_corruption(bool linkage)
+T_DECL(tiny_freelist_corruption, "Crash on corruption of tiny freelist",
+ T_META_ENVVAR("MallocXzoneSlotConfig=0"),
+ T_META_IGNORECRASHES("xzone_corruption"),
+ T_META_TAG_XZONE_ONLY,
+ T_META_ENABLED(__has_feature(ptrauth_calls)))
{
pid_t child_pid = fork();
T_ASSERT_NE(child_pid, -1, "fork()");
@@ -62,11 +65,7 @@
free(p2);
xzm_block_t block = p2;
- if (linkage) {
- block->xzb_linkage.xzbl_next_value ^= (1ull << bit_to_flip);
- } else {
- block->xzb_cookie ^= (1ull << bit_to_flip);
- }
+ block->xzb_linkage.xzbl_next_value ^= (1ull << bit_to_flip);
p2 = malloc_wrapper(1024);
}
@@ -88,25 +87,6 @@
}
}
-T_DECL(tiny_freelist_cookie_corruption,
- "Crash on corruption of tiny freelist cookie",
- T_META_ENVVAR("MallocXzoneSlotConfig=0"),
- T_META_IGNORECRASHES("xzone_corruption"),
- T_META_TAG_XZONE_ONLY)
-{
- test_freelist_corruption(false);
-}
-
-T_DECL(tiny_freelist_linkage_corruption,
- "Crash on corruption of tiny freelist linkage",
- T_META_ENVVAR("MallocXzoneSlotConfig=0"),
- T_META_IGNORECRASHES("xzone_corruption"),
- T_META_TAG_XZONE_ONLY,
- T_META_ENABLED(__has_feature(ptrauth_calls)))
-{
- test_freelist_corruption(true);
-}
-
#else // CONFIG_XZONE_MALLOC
T_DECL(tiny_freelist_corruption, "Crash on corruption of tiny freelist",