This is an archive of the discontinued LLVM Phabricator instance.

Differential D45739

[HWASan] Add "N" suffix to generic __hwasan_load/store.
ClosedPublic

Authored by alekseyshl on Apr 17 2018, 2:32 PM.

Details

Reviewers
eugenis
Commits
rG02f7841e4a8c: [HWASan] Add "N" suffix to generic __hwasan_load/store.
rCRT330297: [HWASan] Add "N" suffix to generic __hwasan_load/store.
rL330297: [HWASan] Add "N" suffix to generic __hwasan_load/store.
Summary

"N" suffix is added by the instrumentation and interface functions
are expected to be exported from the library as hwasan_loadN* and
hwasan_storeN*.

Diff Detail

Event Timeline

alekseyshl created this revision.Apr 17 2018, 2:32 PM
Herald added subscribers: Restricted Project, delcypher, kubamracek. · View Herald TranscriptApr 17 2018, 2:32 PM
Harbormaster completed remote builds in B17150: Diff 142830.Apr 17 2018, 2:33 PM
eugenis added a comment.Apr 17 2018, 3:45 PM

Add a test, please.

alekseyshl updated this revision to Diff 143008.Apr 18 2018, 3:03 PM
  • Add a test
Harbormaster completed remote builds in B17197: Diff 143008.Apr 18 2018, 3:03 PM
eugenis accepted this revision.Apr 18 2018, 3:04 PM

Thanks!

This revision is now accepted and ready to land.Apr 18 2018, 3:04 PM
Closed by commit rL330297: [HWASan] Add "N" suffix to generic __hwasan_load/store. (authored by alekseyshl). · Explain WhyApr 18 2018, 3:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
hwasan/
8 lines
8 lines

Diff 142830

lib/hwasan/hwasan.cc

Show First 20 Lines • Show All 300 Lines • ▼ Show 20 Lines__attribute__((always_inline, nodebug)) static void CheckAddressSized(uptr p,
for (tag_t *t = shadow_first; t <= shadow_last; ++t) for (tag_t *t = shadow_first; t <= shadow_last; ++t)
if (UNLIKELY(ptr_tag != *t)) { if (UNLIKELY(ptr_tag != *t)) {
SigTrap<0x20 * (EA == ErrorAction::Recover) + SigTrap<0x20 * (EA == ErrorAction::Recover) +
0x10 * (AT == AccessType::Store) + 0xf>(p); 0x10 * (AT == AccessType::Store) + 0xf>(p);
if (EA == ErrorAction::Abort) __builtin_unreachable(); if (EA == ErrorAction::Abort) __builtin_unreachable();
} }
} }
void __hwasan_load(uptr p, uptr sz) { void __hwasan_loadN(uptr p, uptr sz) {
CheckAddressSized<ErrorAction::Abort, AccessType::Load>(p, sz); CheckAddressSized<ErrorAction::Abort, AccessType::Load>(p, sz);
} }
void __hwasan_load1(uptr p) { void __hwasan_load1(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Load, 0>(p); CheckAddress<ErrorAction::Abort, AccessType::Load, 0>(p);
} }
void __hwasan_load2(uptr p) { void __hwasan_load2(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Load, 1>(p); CheckAddress<ErrorAction::Abort, AccessType::Load, 1>(p);
} }
void __hwasan_load4(uptr p) { void __hwasan_load4(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Load, 2>(p); CheckAddress<ErrorAction::Abort, AccessType::Load, 2>(p);
} }
void __hwasan_load8(uptr p) { void __hwasan_load8(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Load, 3>(p); CheckAddress<ErrorAction::Abort, AccessType::Load, 3>(p);
} }
void __hwasan_load16(uptr p) { void __hwasan_load16(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Load, 4>(p); CheckAddress<ErrorAction::Abort, AccessType::Load, 4>(p);
} }
void __hwasan_load_noabort(uptr p, uptr sz) { void __hwasan_loadN_noabort(uptr p, uptr sz) {
CheckAddressSized<ErrorAction::Recover, AccessType::Load>(p, sz); CheckAddressSized<ErrorAction::Recover, AccessType::Load>(p, sz);
} }
void __hwasan_load1_noabort(uptr p) { void __hwasan_load1_noabort(uptr p) {
CheckAddress<ErrorAction::Recover, AccessType::Load, 0>(p); CheckAddress<ErrorAction::Recover, AccessType::Load, 0>(p);
} }
void __hwasan_load2_noabort(uptr p) { void __hwasan_load2_noabort(uptr p) {
CheckAddress<ErrorAction::Recover, AccessType::Load, 1>(p); CheckAddress<ErrorAction::Recover, AccessType::Load, 1>(p);
} }
void __hwasan_load4_noabort(uptr p) { void __hwasan_load4_noabort(uptr p) {
CheckAddress<ErrorAction::Recover, AccessType::Load, 2>(p); CheckAddress<ErrorAction::Recover, AccessType::Load, 2>(p);
} }
void __hwasan_load8_noabort(uptr p) { void __hwasan_load8_noabort(uptr p) {
CheckAddress<ErrorAction::Recover, AccessType::Load, 3>(p); CheckAddress<ErrorAction::Recover, AccessType::Load, 3>(p);
} }
void __hwasan_load16_noabort(uptr p) { void __hwasan_load16_noabort(uptr p) {
CheckAddress<ErrorAction::Recover, AccessType::Load, 4>(p); CheckAddress<ErrorAction::Recover, AccessType::Load, 4>(p);
} }
void __hwasan_store(uptr p, uptr sz) { void __hwasan_storeN(uptr p, uptr sz) {
CheckAddressSized<ErrorAction::Abort, AccessType::Store>(p, sz); CheckAddressSized<ErrorAction::Abort, AccessType::Store>(p, sz);
} }
void __hwasan_store1(uptr p) { void __hwasan_store1(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Store, 0>(p); CheckAddress<ErrorAction::Abort, AccessType::Store, 0>(p);
} }
void __hwasan_store2(uptr p) { void __hwasan_store2(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Store, 1>(p); CheckAddress<ErrorAction::Abort, AccessType::Store, 1>(p);
} }
void __hwasan_store4(uptr p) { void __hwasan_store4(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Store, 2>(p); CheckAddress<ErrorAction::Abort, AccessType::Store, 2>(p);
} }
void __hwasan_store8(uptr p) { void __hwasan_store8(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Store, 3>(p); CheckAddress<ErrorAction::Abort, AccessType::Store, 3>(p);
} }
void __hwasan_store16(uptr p) { void __hwasan_store16(uptr p) {
CheckAddress<ErrorAction::Abort, AccessType::Store, 4>(p); CheckAddress<ErrorAction::Abort, AccessType::Store, 4>(p);
} }
void __hwasan_store_noabort(uptr p, uptr sz) { void __hwasan_storeN_noabort(uptr p, uptr sz) {
CheckAddressSized<ErrorAction::Recover, AccessType::Store>(p, sz); CheckAddressSized<ErrorAction::Recover, AccessType::Store>(p, sz);
} }
void __hwasan_store1_noabort(uptr p) { void __hwasan_store1_noabort(uptr p) {
CheckAddress<ErrorAction::Recover, AccessType::Store, 0>(p); CheckAddress<ErrorAction::Recover, AccessType::Store, 0>(p);
} }
void __hwasan_store2_noabort(uptr p) { void __hwasan_store2_noabort(uptr p) {
CheckAddress<ErrorAction::Recover, AccessType::Store, 1>(p); CheckAddress<ErrorAction::Recover, AccessType::Store, 1>(p);
} }
Show All 36 Lines

lib/hwasan/hwasan_interface_internal.h

Show All 26 Lines
using __sanitizer::uu32; using __sanitizer::uu32;
using __sanitizer::uu16; using __sanitizer::uu16;
using __sanitizer::u64; using __sanitizer::u64;
using __sanitizer::u32; using __sanitizer::u32;
using __sanitizer::u16; using __sanitizer::u16;
using __sanitizer::u8; using __sanitizer::u8;
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load(uptr, uptr); void __hwasan_loadN(uptr, uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load1(uptr); void __hwasan_load1(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load2(uptr); void __hwasan_load2(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load4(uptr); void __hwasan_load4(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load8(uptr); void __hwasan_load8(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load16(uptr); void __hwasan_load16(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load_noabort(uptr, uptr); void __hwasan_loadN_noabort(uptr, uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load1_noabort(uptr); void __hwasan_load1_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load2_noabort(uptr); void __hwasan_load2_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load4_noabort(uptr); void __hwasan_load4_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load8_noabort(uptr); void __hwasan_load8_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_load16_noabort(uptr); void __hwasan_load16_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store(uptr, uptr); void __hwasan_storeN(uptr, uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store1(uptr); void __hwasan_store1(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store2(uptr); void __hwasan_store2(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store4(uptr); void __hwasan_store4(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store8(uptr); void __hwasan_store8(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store16(uptr); void __hwasan_store16(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store_noabort(uptr, uptr); void __hwasan_storeN_noabort(uptr, uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store1_noabort(uptr); void __hwasan_store1_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store2_noabort(uptr); void __hwasan_store2_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store4_noabort(uptr); void __hwasan_store4_noabort(uptr);
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __hwasan_store8_noabort(uptr); void __hwasan_store8_noabort(uptr);
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines