-
Notifications
You must be signed in to change notification settings - Fork 10.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Summary: Adds a call to __hwasan_handle_vfork(SP) at each landingpad entry. Reusing __hwasan_handle_vfork instead of introducing a new runtime call in order to be ABI-compatible with old runtime library. Reviewers: pcc Subscribers: kubamracek, hiraditya, #sanitizers, llvm-commits Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D61968 llvm-svn: 360959
- Loading branch information
Showing
3 changed files
with
133 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// RUN: %clangxx_hwasan %s -o %t && %run %t 2>&1 | FileCheck %s --check-prefix=GOOD | ||
// RUN: %clangxx_hwasan %s -mllvm -hwasan-instrument-landing-pads=0 -o %t && not %run %t 2>&1 | FileCheck %s --check-prefix=BAD | ||
|
||
#include <stdexcept> | ||
#include <cstdio> | ||
|
||
static void optimization_barrier(void* arg) { | ||
asm volatile("" : : "r"(arg) : "memory"); | ||
} | ||
|
||
__attribute__((noinline)) | ||
void h() { | ||
char x[1000]; | ||
optimization_barrier(x); | ||
throw std::runtime_error("hello"); | ||
} | ||
|
||
__attribute__((noinline)) | ||
void g() { | ||
char x[1000]; | ||
optimization_barrier(x); | ||
h(); | ||
optimization_barrier(x); | ||
} | ||
|
||
__attribute__((noinline)) | ||
void hwasan_read(char *p, int size) { | ||
char volatile sink; | ||
for (int i = 0; i < size; ++i) | ||
sink = p[i]; | ||
} | ||
|
||
__attribute__((noinline, no_sanitize("hwaddress"))) void after_catch() { | ||
char x[10000]; | ||
hwasan_read(&x[0], sizeof(x)); | ||
} | ||
|
||
|
||
__attribute__((noinline)) | ||
void f() { | ||
char x[1000]; | ||
try { | ||
// Put two tagged frames on the stack, throw an exception from the deepest one. | ||
g(); | ||
} catch (const std::runtime_error &e) { | ||
// Put an untagged frame on stack, check that it is indeed untagged. | ||
// This relies on exception support zeroing out stack tags. | ||
// BAD: tag-mismatch | ||
after_catch(); | ||
// Check that an in-scope stack allocation is still tagged. | ||
// This relies on exception support not zeroing too much. | ||
hwasan_read(&x[0], sizeof(x)); | ||
// GOOD: hello | ||
printf("%s\n", e.what()); | ||
} | ||
} | ||
|
||
int main() { | ||
f(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
llvm/test/Instrumentation/HWAddressSanitizer/landingpad.ll
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
; RUN: opt < %s -mtriple aarch64-linux-android -hwasan -S | FileCheck %s --check-prefixes=COMMON,ARM | ||
; RUN: opt < %s -mtriple x86_64-linux -hwasan -S | FileCheck %s --check-prefixes=COMMON,X86 | ||
|
||
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" | ||
target triple = "aarch64-unknown-linux-android" | ||
|
||
define i32 @f() local_unnamed_addr sanitize_hwaddress personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) { | ||
entry: | ||
invoke void @g() | ||
to label %return unwind label %lpad | ||
|
||
lpad: | ||
; COMMON: landingpad { i8*, i32 } | ||
; COMMON-NEXT: catch i8* null | ||
%0 = landingpad { i8*, i32 } | ||
catch i8* null | ||
|
||
; COMMON-NEXT: %[[X:[^ ]*]] = call i64 @llvm.read_register.i64(metadata ![[META:[^ ]*]]) | ||
; COMMON-NEXT: call void @__hwasan_handle_vfork(i64 %[[X]]) | ||
|
||
%1 = extractvalue { i8*, i32 } %0, 0 | ||
%2 = tail call i8* @__cxa_begin_catch(i8* %1) | ||
tail call void @__cxa_end_catch() | ||
br label %return | ||
return: | ||
%retval.0 = phi i32 [ 1, %lpad ], [ 0, %entry ] | ||
ret i32 %retval.0 | ||
} | ||
|
||
declare void @g() local_unnamed_addr | ||
|
||
declare i32 @__gxx_personality_v0(...) | ||
declare i8* @__cxa_begin_catch(i8*) local_unnamed_addr | ||
declare void @__cxa_end_catch() local_unnamed_addr | ||
|
||
; ARM: ![[META]] = !{!"sp"} | ||
; X86: ![[META]] = !{!"rsp"} |