maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[hwasan] Prevent reordering of tag checks. 

They were previously unconstrained, which allowed them to be reordered
before the shadow memory write.

Reviewed By: eugenis

Differential Revision: https://reviews.llvm.org/D107901
This commit is contained in:
Florian Mayer 2021-08-11 14:25:50 +01:00
parent 6d952b08bd
commit 0deedaa23f
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/IR/Intrinsics.td
View File

@ -1570,10 +1570,10 @@ def int_load_relative: DefaultAttrsIntrinsic<[llvm_ptr_ty], [llvm_ptr_ty, llvm_a
def int_hwasan_check_memaccess :
Intrinsic<[], [llvm_ptr_ty, llvm_ptr_ty, llvm_i32_ty],
[IntrInaccessibleMemOnly, ImmArg<ArgIndex<2>>]>;
[ImmArg<ArgIndex<2>>]>;
def int_hwasan_check_memaccess_shortgranules :
Intrinsic<[], [llvm_ptr_ty, llvm_ptr_ty, llvm_i32_ty],
[IntrInaccessibleMemOnly, ImmArg<ArgIndex<2>>]>;
[ImmArg<ArgIndex<2>>]>;
// Xray intrinsics
//===----------------------------------------------------------------------===//

20
llvm/test/Instrumentation/HWAddressSanitizer/memaccess-clobber.ll Normal file
View File

@ -0,0 +1,20 @@
; Make sure memaccess checks preceed the following reads.
;
; RUN: opt < %s -S -enable-new-pm=0 -hwasan -basic-aa -memdep -print-memdeps -analyze -mtriple aarch64-linux-android30 | FileCheck %s
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
target triple = "aarch64--linux-android10000"
declare void @use32(i32*)
define i32 @test_alloca() sanitize_hwaddress {
entry:
%x = alloca i32, align 4
call void @use32(i32* nonnull %x)
; CHECK: Clobber from: call void @llvm.hwasan.check.memaccess.shortgranule
; CHECK-NEXT: load i32, i32* %x.hwasan, align 4
%y = load i32, i32* %x
; CHECK: Clobber from: %y = load i32, i32* %x.hwasan, align 4
; CHECK-NEXT: call void @llvm.memset.p0i8.i64(i8* align 1 {{.*}}, i8 0, i64 1, i1 false)
ret i32 %y
}