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

[cfi] Fix handling of uninstrumented libraries. 

CFI shadow for non-CFI libraries should be "unchecked", not "invalid".

llvm-svn: 256285
This commit is contained in:
Evgeniy Stepanov 2015-12-22 21:40:09 +00:00
parent 30747f72eb
commit f02b782aa7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/cfi/cfi.cc
View File

@ -176,7 +176,7 @@ static int dl_iterate_phdr_cb(dl_phdr_info *info, size_t size, void *data) {
VReport(1, " %zx .. %zx\n", cur_beg, cur_end); VReport(1, " %zx .. %zx\n", cur_beg, cur_end);
fill_shadow(cur_beg, cur_end, cfi_check ? cfi_check : (uptr)(-1)); fill_shadow(cur_beg, cur_end, cfi_check ? cfi_check : (uptr)(-1));
} else { } else {
fill_shadow_constant(cur_beg, cur_end, kInvalidShadow); fill_shadow_constant(cur_beg, cur_end, kUncheckedShadow);
} }
} }
} }

5
compiler-rt/test/cfi/cross-dso/simple-fail.cpp
View File

@ -23,6 +23,11 @@
// RUN: %t5 2>&1 | FileCheck --check-prefix=NCFI %s // RUN: %t5 2>&1 | FileCheck --check-prefix=NCFI %s
// RUN: %t5 x 2>&1 | FileCheck --check-prefix=NCFI %s // RUN: %t5 x 2>&1 | FileCheck --check-prefix=NCFI %s
// RUN: %clangxx -DBM -DSHARED_LIB %s -fPIC -shared -o %t6-so.so
// RUN: %clangxx_cfi_dso -DBM %s -o %t6 %t6-so.so
// RUN: %t6 2>&1 | FileCheck --check-prefix=NCFI %s
// RUN: %t6 x 2>&1 | FileCheck --check-prefix=NCFI %s
// Tests that the CFI mechanism crashes the program when making a virtual call // Tests that the CFI mechanism crashes the program when making a virtual call
// to an object of the wrong class but with a compatible vtable, by casting a // to an object of the wrong class but with a compatible vtable, by casting a
// pointer to such an object and attempting to make a call through it. // pointer to such an object and attempting to make a call through it.