Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the ability to opt-out of ASan container annotations on a per-allocator basis #5241

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3428840
add naive first implementation of per-allocator disablement of ASan
davidmrdavid Jan 16, 2025
790ac7e
improve comments
davidmrdavid Jan 16, 2025
846061c
Simplify implementation
davidmrdavid Jan 16, 2025
71c7716
constexpr if-statement and rename variable template
davidmrdavid Jan 16, 2025
0cfbb2f
checkpoint progress
davidmrdavid Jan 16, 2025
a040f8c
checkpoint progress: allocator is non-conforming still
davidmrdavid Jan 18, 2025
7bec17a
add seemingly compliant arena allocator. some TODOs and FIXMEs remain
davidmrdavid Jan 22, 2025
76e0723
remove whitespace
davidmrdavid Jan 22, 2025
516d2c0
add basic_string test and implementation
davidmrdavid Jan 23, 2025
6b04254
fix indentation
davidmrdavid Jan 23, 2025
a5de291
template new test
davidmrdavid Jan 23, 2025
4cc951b
remove use of arena allocator to simplify tests, basic_string test st…
davidmrdavid Jan 23, 2025
3f2111d
Merge branch 'main' of https://github.com/microsoft/STL into dev/daju…
davidmrdavid Jan 24, 2025
9823cb4
edit string test
davidmrdavid Jan 24, 2025
6188041
reference new GH bug in PR
davidmrdavid Jan 24, 2025
57e7aff
rename template variable as per feedback
davidmrdavid Jan 28, 2025
6c6545c
Merge branch 'main' of https://github.com/microsoft/STL into dev/daju…
davidmrdavid Jan 29, 2025
6d0b7b8
fixup tests
davidmrdavid Jan 30, 2025
cbb714d
clean up comments
davidmrdavid Jan 30, 2025
59fa3c9
Follow the "can_throw" pattern in copy assignment.
StephanTLavavej Jan 30, 2025
b6c5dca
Guard vector/string logic with `if constexpr (!disable)` to avoid dea…
StephanTLavavej Jan 30, 2025
9f68b17
Fix comments.
StephanTLavavej Jan 30, 2025
45709b9
Avoid shadowing: `vector` => `v`
StephanTLavavej Jan 30, 2025
af4fc60
Drop unnecessary `std::`.
StephanTLavavej Jan 30, 2025
1b66d92
Improve add_death_tests: add char, move char8_t, add trailing commas.
StephanTLavavej Jan 30, 2025
12c763f
Style: `T()` => `T{}`
StephanTLavavej Jan 30, 2025
44a336a
Disable for all `<T, Pocma, Stateless>` (and `typename` => `class` ni…
StephanTLavavej Jan 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions stl/inc/vector
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,10 @@ private:
return;
}

if constexpr (!_Is_ASan_enabled_for_allocator<allocator_type>) {
return;
}

const void* const _First = _STD _Unfancy(_First_);
const void* const _End = _STD _Unfancy(_End_);
const void* const _Old_last = _STD _Unfancy(_Old_last_);
Expand Down
4 changes: 4 additions & 0 deletions stl/inc/xmemory
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,10 @@ struct _Simple_types { // wraps types from allocators with simple addressing for
_INLINE_VAR constexpr size_t _Asan_granularity = 8;
_INLINE_VAR constexpr size_t _Asan_granularity_mask = _Asan_granularity - 1;

// Represents whether ASan container annotations are enabled a given allocator.
template <class>
constexpr bool _Is_ASan_enabled_for_allocator = true;
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved

struct _Asan_aligned_pointers {
const void* _First;
const void* _End;
Expand Down
4 changes: 4 additions & 0 deletions stl/inc/xstring
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,10 @@ private:
return;
}

if constexpr (!_Is_ASan_enabled_for_allocator<allocator_type>) {
return;
}

// Note that `_Capacity`, `_Old_size`, and `_New_size` do not include the null terminator
const void* const _End = _First + _Capacity + 1;
const void* const _Old_last = _First + _Old_size + 1;
Expand Down
35 changes: 35 additions & 0 deletions tests/std/tests/GH_002030_asan_annotate_string/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,26 @@ STATIC_ASSERT(_Container_allocation_minimum_asan_alignment<
basic_string<wchar_t, char_traits<wchar_t>, implicit_allocator<wchar_t>>>
== 2);

// Simple implicit allocator that opts out of ASan annotations (via `_Is_ASan_enabled_for_allocator`)
template <class T, class Pocma = true_type, class Stateless = true_type>
struct implicit_allocator_no_asan_annotations : implicit_allocator<T, Pocma, Stateless> {
implicit_allocator_no_asan_annotations() = default;
template <class U>
constexpr implicit_allocator_no_asan_annotations(const implicit_allocator_no_asan_annotations<U, Pocma, Stateless>&) noexcept {}

T* allocate(size_t n) {
T* mem = new T[n + 1];
return mem + 1;
}

void deallocate(T* p, size_t) noexcept {
delete[] (p - 1);
}
};

template <typename T>
constexpr bool _Is_ASan_enabled_for_allocator<implicit_allocator_no_asan_annotations<T>> = true;

template <class Alloc>
void test_construction() {
using CharType = typename Alloc::value_type;
Expand Down Expand Up @@ -1853,6 +1873,20 @@ void run_tests() {
#endif // ^^^ no workaround ^^^
}

// Tests that ASan analysis can be disabled for a vector with an arena allocator.
template <class CharType>
void run_asan_disablement_test() {

// We'll give the string capacity 100
std::basic_string<CharType, std::char_traits<CharType>, implicit_allocator_no_asan_annotations<CharType>> myString;
myString.reserve(100);

CharType* data = &myString[0]; // Get a mutable pointer to the string's data
data[50] = CharType{'A'}; // TODO: this isn't failing due to bug: https://github.com/microsoft/STL/issues/5251

// TODO: is it possible to add a 'negative' test case here? One where ASan expectedly fails?
}

template <class CharType, template <class, class, class> class Alloc>
void run_custom_allocator_matrix() {
run_tests<Alloc<CharType, true_type, true_type>>();
Expand All @@ -1867,6 +1901,7 @@ void run_allocator_matrix() {
run_custom_allocator_matrix<CharType, aligned_allocator>();
run_custom_allocator_matrix<CharType, explicit_allocator>();
run_custom_allocator_matrix<CharType, implicit_allocator>();
run_asan_disablement_test<CharType>();
}

void test_DevCom_10116361() {
Expand Down
38 changes: 38 additions & 0 deletions tests/std/tests/GH_002030_asan_annotate_vector/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,26 @@ struct implicit_allocator : custom_test_allocator<T, Pocma, Stateless> {
STATIC_ASSERT(_Container_allocation_minimum_asan_alignment<vector<char, implicit_allocator<char>>> == 1);
STATIC_ASSERT(_Container_allocation_minimum_asan_alignment<vector<wchar_t, implicit_allocator<wchar_t>>> == 2);

// Simple implicit allocator that opts out of ASan annotations (via `_Is_ASan_enabled_for_allocator`)
template <class T, class Pocma = true_type, class Stateless = true_type>
struct implicit_allocator_no_asan_annotations : implicit_allocator<T, Pocma, Stateless> {
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
implicit_allocator_no_asan_annotations() = default;
template <class U>
constexpr implicit_allocator_no_asan_annotations(const implicit_allocator_no_asan_annotations<U, Pocma, Stateless>&) noexcept {}

T* allocate(size_t n) {
T* mem = new T[n + 1];
return mem + 1;
}

void deallocate(T* p, size_t) noexcept {
delete[] (p - 1);
}
};

template <typename T>
StephanTLavavej marked this conversation as resolved.
Show resolved Hide resolved
constexpr bool _Is_ASan_enabled_for_allocator<implicit_allocator_no_asan_annotations<T>> = false;

template <class Alloc>
void test_push_pop() {
using T = typename Alloc::value_type;
Expand Down Expand Up @@ -1002,12 +1022,30 @@ void run_custom_allocator_matrix() {
run_tests<AllocT<T, false_type, false_type>>();
}

// Tests that ASan analysis can be disabled for a vector with an arena allocator.
template <class T>
void run_asan_disablement_test() {

// We'll give the vector capacity 100
std::vector<T, implicit_allocator_no_asan_annotations<T>> vec;
vec.reserve(100);

// We access position (50) of the vector, which is within the capacity of the vector
// but uninitialized. This would normally trigger an AV because of ASan annotations.
// However, the allocator has opted out of ASan analysis through,
// `_Is_ASan_enabled_for_allocator`, so this should succeed.
vec.data()[50] = T();

// TODO: is it possible to add a 'negative' test case here? One where ASan expectedly fails?
davidmrdavid marked this conversation as resolved.
Show resolved Hide resolved
}

template <class T>
void run_allocator_matrix() {
run_tests<allocator<T>>();
run_custom_allocator_matrix<T, aligned_allocator>();
run_custom_allocator_matrix<T, explicit_allocator>();
run_custom_allocator_matrix<T, implicit_allocator>();
run_asan_disablement_test<T>();
}

int main() {
Expand Down