Skip to content
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.

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

Reland '[hwasan] Add fixed_shadow_base flag (#73980)' #95445

Merged
merged 4 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions compiler-rt/lib/hwasan/hwasan_flags.inc
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,10 @@ HWASAN_FLAG(bool, malloc_bisect_dump, false,
// are untagged before the call.
HWASAN_FLAG(bool, fail_without_syscall_abi, true,
"Exit if fail to request relaxed syscall ABI.")

HWASAN_FLAG(
uptr, fixed_shadow_base, -1,
"If not -1, HWASan will attempt to allocate the shadow at this address, "
"instead of choosing one dynamically."
"Tip: this can be combined with the compiler option, "
"-hwasan-mapping-offset, to optimize the instrumentation.")
9 changes: 7 additions & 2 deletions compiler-rt/lib/hwasan/hwasan_linux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,13 @@ static uptr GetHighMemEnd() {
}

static void InitializeShadowBaseAddress(uptr shadow_size_bytes) {
__hwasan_shadow_memory_dynamic_address =
FindDynamicShadowStart(shadow_size_bytes);
// FIXME: Android should init flags before shadow.
if (!SANITIZER_ANDROID && flags()->fixed_shadow_base != (uptr)-1) {
vitalybuka marked this conversation as resolved.
Show resolved Hide resolved
vitalybuka marked this conversation as resolved.
Show resolved Hide resolved
__hwasan_shadow_memory_dynamic_address = flags()->fixed_shadow_base;
} else {
__hwasan_shadow_memory_dynamic_address =
FindDynamicShadowStart(shadow_size_bytes);
}
}

static void MaybeDieIfNoTaggingAbi(const char *message) {
Expand Down
76 changes: 76 additions & 0 deletions compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// Test fixed shadow base functionality.
//
// Default compiler instrumentation works with any shadow base (dynamic or fixed).
// RUN: %clang_hwasan %s -o %t && %run %t
// RUN: %clang_hwasan %s -o %t && HWASAN_OPTIONS=fixed_shadow_base=263878495698944 %run %t
// RUN: %clang_hwasan %s -o %t && HWASAN_OPTIONS=fixed_shadow_base=4398046511104 %run %t
//
// If -hwasan-mapping-offset is set, then the fixed_shadow_base needs to match.
// RUN: %clang_hwasan %s -mllvm -hwasan-mapping-offset=263878495698944 -o %t && HWASAN_OPTIONS=fixed_shadow_base=263878495698944 %run %t
// RUN: %clang_hwasan %s -mllvm -hwasan-mapping-offset=4398046511104 -o %t && HWASAN_OPTIONS=fixed_shadow_base=4398046511104 %run %t
// RUN: %clang_hwasan %s -mllvm -hwasan-mapping-offset=263878495698944 -o %t && HWASAN_OPTIONS=fixed_shadow_base=4398046511104 not %run %t
// RUN: %clang_hwasan %s -mllvm -hwasan-mapping-offset=4398046511104 -o %t && HWASAN_OPTIONS=fixed_shadow_base=263878495698944 not %run %t
//
// Note: if fixed_shadow_base is not set, compiler-rt will dynamically choose a
// shadow base, which has a tiny but non-zero probability of matching the
// compiler instrumentation. To avoid test flake, we do not test this case.
//
// Assume 48-bit VMA
// REQUIRES: aarch64-target-arch
//
// REQUIRES: Clang
//
// UNSUPPORTED: android

#include <assert.h>
#include <sanitizer/allocator_interface.h>
#include <sanitizer/hwasan_interface.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>

int main() {
__hwasan_enable_allocator_tagging();

// We test that the compiler instrumentation is able to access shadow memory
// for many different addresses. If we only test a small number of addresses,
// it might work by chance even if the shadow base does not match between the
// compiler instrumentation and compiler-rt.
void **mmaps[256];
// 48-bit VMA
for (int i = 0; i < 256; i++) {
unsigned long long addr = (i * (1ULL << 40));

void *p = mmap((void *)addr, 4096, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
// We don't use MAP_FIXED, to avoid overwriting critical memory.
// However, if we don't get allocated the requested address, it
// isn't a useful test.
if ((unsigned long long)p != addr) {
munmap(p, 4096);
mmaps[i] = MAP_FAILED;
} else {
mmaps[i] = p;
}
}

int failures = 0;
for (int i = 0; i < 256; i++) {
if (mmaps[i] == MAP_FAILED) {
failures++;
} else {
printf("%d %p\n", i, mmaps[i]);
munmap(mmaps[i], 4096);
}
}

// We expect roughly 17 failures:
// - the page at address zero
// - 16 failures because the shadow memory takes up 1/16th of the address space
// We could also get unlucky e.g., if libraries or binaries are loaded into the
// exact addresses where we tried to map.
// To avoid test flake, we allow some margin of error.
printf("Failed: %d\n", failures);
assert(failures < 48);
return 0;
}
Loading