This is an archive of the discontinued LLVM Phabricator instance.

Differential D39472

[asan] Ensure that the minimum redzone is at least SHADOW_GRANULARITY
ClosedPublic

Authored by waltl on Oct 31 2017, 1:58 PM.

Details

Reviewers
vitalybuka
eugenis
alekseyshl
Commits
rG13a3cf3b6a23: [asan] Ensure that the minimum redzone is at least SHADOW_GRANULARITY
rCRT318422: [asan] Ensure that the minimum redzone is at least SHADOW_GRANULARITY
rL318422: [asan] Ensure that the minimum redzone is at least SHADOW_GRANULARITY
Summary

This is required by the Asan run-time.

Diff Detail

Event Timeline

waltl created this revision.Oct 31 2017, 1:58 PM
Herald added a subscriber: kubamracek. · View Herald TranscriptOct 31 2017, 1:58 PM
kosarev added a subscriber: kosarev.Nov 1 2017, 1:38 AM
waltl added reviewers: vitalybuka, eugenis, alekseyshl.Nov 7 2017, 5:01 PM
waltl added subscribers: kcc, llvm-commits.
vitalybuka added inline comments.Nov 15 2017, 2:39 PM
compiler-rt/lib/asan/asan_activation.cc
117

disabled.max_redzone = disabled.min_redzone

compiler-rt/lib/asan/asan_flags.cc
73

This should be around line 147, // Flag validation:

waltl updated this revision to Diff 123184.Nov 16 2017, 8:04 AM

Address CR comments

waltl marked 2 inline comments as done.Nov 16 2017, 8:05 AM
Harbormaster completed remote builds in B12241: Diff 123184.Nov 16 2017, 8:06 AM
vitalybuka accepted this revision.Nov 16 2017, 8:24 AM
This revision is now accepted and ready to land.Nov 16 2017, 8:24 AM
Closed by commit rL318422: [asan] Ensure that the minimum redzone is at least SHADOW_GRANULARITY (authored by waltl). · Explain WhyNov 16 2017, 9:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
lib/
asan/
7 lines
2 lines

Diff 121051

compiler-rt/lib/asan/asan_activation.cc

Show All 10 Lines
// //
// ASan activation/deactivation logic. // ASan activation/deactivation logic.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "asan_activation.h" #include "asan_activation.h"
#include "asan_allocator.h" #include "asan_allocator.h"
#include "asan_flags.h" #include "asan_flags.h"
#include "asan_internal.h" #include "asan_internal.h"
#include "asan_mapping.h"
#include "asan_poisoning.h" #include "asan_poisoning.h"
#include "asan_stack.h" #include "asan_stack.h"
#include "sanitizer_common/sanitizer_common.h"
#include "sanitizer_common/sanitizer_flags.h" #include "sanitizer_common/sanitizer_flags.h"
namespace __asan { namespace __asan {
static struct AsanDeactivatedFlags { static struct AsanDeactivatedFlags {
AllocatorOptions allocator_options; AllocatorOptions allocator_options;
int malloc_context_size; int malloc_context_size;
bool poison_heap; bool poison_heap;
▲ Show 20 Lines • Show All 76 Lines • ▼ Show 20 Linesvoid AsanDeactivate() {
// Deactivate the runtime. // Deactivate the runtime.
SetCanPoisonMemory(false); SetCanPoisonMemory(false);
SetMallocContextSize(1); SetMallocContextSize(1);
AllocatorOptions disabled = asan_deactivated_flags.allocator_options; AllocatorOptions disabled = asan_deactivated_flags.allocator_options;
disabled.quarantine_size_mb = 0; disabled.quarantine_size_mb = 0;
disabled.thread_local_quarantine_size_kb = 0; disabled.thread_local_quarantine_size_kb = 0;
disabled.min_redzone = 16; // Redzone must be at least 16 bytes long. // Redzone must be at least Max(16, granularity) bytes long.
disabled.max_redzone = 16; disabled.min_redzone = Max(16, (int)SHADOW_GRANULARITY);
disabled.max_redzone = Max(16, (int)SHADOW_GRANULARITY);
vitalybukaUnsubmitted
Done
ReplyInline Actions

disabled.max_redzone = disabled.min_redzone

vitalybuka: disabled.max_redzone = disabled.min_redzone
disabled.alloc_dealloc_mismatch = false; disabled.alloc_dealloc_mismatch = false;
disabled.may_return_null = true; disabled.may_return_null = true;
ReInitializeAllocator(disabled); ReInitializeAllocator(disabled);
asan_is_deactivated = true; asan_is_deactivated = true;
} }
void AsanActivate() { void AsanActivate() {
Show All 19 Lines

compiler-rt/lib/asan/asan_flags.cc

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines SetCommonFlagsDefaults();
cf.external_symbolizer_path = GetEnv("ASAN_SYMBOLIZER_PATH"); cf.external_symbolizer_path = GetEnv("ASAN_SYMBOLIZER_PATH");
cf.malloc_context_size = kDefaultMallocContextSize; cf.malloc_context_size = kDefaultMallocContextSize;
cf.intercept_tls_get_addr = true; cf.intercept_tls_get_addr = true;
cf.exitcode = 1; cf.exitcode = 1;
OverrideCommonFlags(cf); OverrideCommonFlags(cf);
} }
Flags *f = flags(); Flags *f = flags();
f->SetDefaults(); f->SetDefaults();
if (f->redzone < (int)SHADOW_GRANULARITY)
vitalybukaUnsubmitted
Done
ReplyInline Actions

This should be around line 147, // Flag validation:

vitalybuka: This should be around line 147, // Flag validation:
f->redzone = SHADOW_GRANULARITY;
FlagParser asan_parser; FlagParser asan_parser;
RegisterAsanFlags(&asan_parser, f); RegisterAsanFlags(&asan_parser, f);
RegisterCommonFlags(&asan_parser); RegisterCommonFlags(&asan_parser);
// Set the default values and prepare for parsing LSan and UBSan flags // Set the default values and prepare for parsing LSan and UBSan flags
// (which can also overwrite common flags). // (which can also overwrite common flags).
#if CAN_SANITIZE_LEAKS #if CAN_SANITIZE_LEAKS
▲ Show 20 Lines • Show All 131 Lines • Show Last 20 Lines