replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[sanitizer] Handle malloc_destroy_zone() on Darwin 

We currently have a interceptor for malloc_create_zone, which returns a new zone that redirects all the zone requests to our sanitizer zone. However, calling malloc_destroy_zone on that zone will cause libmalloc to print out some warning messages, because the zone is not registered in the list of zones. This patch handles this and adds a testcase for that.

Differential Revision: https://reviews.llvm.org/D27083

llvm-svn: 289375
This commit is contained in:
Kuba Mracek 2016-12-11 08:42:42 +00:00
parent 7a230f4225
commit b93f78128f
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler-rt/lib/sanitizer_common/sanitizer_malloc_mac.inc
View File

@ -46,9 +46,22 @@ INTERCEPTOR(malloc_zone_t *, malloc_create_zone,
// This matches the behavior of malloc_create_zone() on OSX 10.7 and higher.
mprotect(new_zone, allocated_size, PROT_READ);
}
// We're explicitly *NOT* registering the zone.
return new_zone;
}
INTERCEPTOR(void, malloc_destroy_zone, malloc_zone_t *zone) {
COMMON_MALLOC_ENTER();
// We don't need to do anything here. We're not registering new zones, so we
// don't to unregister. Just un-mprotect and free() the zone.
if (GetMacosVersion() >= MACOS_VERSION_LION) {
uptr page_size = GetPageSizeCached();
uptr allocated_size = RoundUpTo(sizeof(sanitizer_zone), page_size);
mprotect(zone, allocated_size, PROT_READ | PROT_WRITE);
}
COMMON_MALLOC_FREE(zone);
}
INTERCEPTOR(malloc_zone_t *, malloc_default_zone, void) {
COMMON_MALLOC_ENTER();
return &sanitizer_zone;

21
compiler-rt/test/asan/TestCases/Darwin/malloc_destroy_zone.cc Normal file
View File

@ -0,0 +1,21 @@
// RUN: %clangxx_asan %s -o %t && %run %t 2>&1 | FileCheck %s
#include <malloc/malloc.h>
#include <stdlib.h>
#include <stdio.h>
int main() {
fprintf(stderr, "start\n");
malloc_zone_t *zone = malloc_create_zone(0, 0);
fprintf(stderr, "zone = %p\n", zone);
malloc_set_zone_name(zone, "myzone");
fprintf(stderr, "name changed\n");
malloc_destroy_zone(zone);
fprintf(stderr, "done\n");
return 0;
}
// CHECK: start
// CHECK-NEXT: zone = 0x{{.*}}
// CHECK-NEXT: name changed
// CHECK-NEXT: done