-
Notifications
You must be signed in to change notification settings - Fork 15.2k
[ASan] Honor allocator_may_return_null when set through user-function and fix large alloc edge case
#117929
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
[ASan] Honor allocator_may_return_null when set through user-function and fix large alloc edge case
#117929
Changes from 4 commits
873cc21
7e7dbfb
71918b1
9de9922
ebc3d0d
7f0e5c0
caac8b5
4f86077
1f66929
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -164,7 +164,24 @@ void UnmapOrDie(void *addr, uptr size, bool raw_report) { | |
| static void *ReturnNullptrOnOOMOrDie(uptr size, const char *mem_type, | ||
| const char *mmap_type) { | ||
| error_t last_error = GetLastError(); | ||
| if (last_error == ERROR_NOT_ENOUGH_MEMORY) | ||
|
|
||
| // Assumption: VirtualAlloc is the last system call that was invoked before | ||
| // this method. | ||
| // VirtualAlloc emits one of 2 error codes when running out of memory | ||
| // 1. ERROR_NOT_ENOUGH_MEMORY: | ||
| // There's not enough memory to execute the command | ||
| // 2. ERROR_INVALID_PARAMETER: | ||
| // VirtualAlloc will return this if the request would allocate memory at an | ||
| // address exceeding or being very close to the maximum application address | ||
| // (the `lpMaximumApplicationAddress` field within the `SystemInfo` struct). | ||
| // This does not seem to be officially documented, but is corroborated here: | ||
| // https://stackoverflow.com/questions/45833674/why-does-virtualalloc-fail-for-lpaddress-greater-than-0x6ffffffffff | ||
|
|
||
| // Note - It's possible that 'ERROR_COMMITMENT_LIMIT' needs to be handled here | ||
| // as well. It is currently not handled due to the lack of a reproducer that | ||
| // induces the error code. | ||
|
Comment on lines
+180
to
+182
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Funnily enough, we're applying a patch to add ERROR_COMMITMENT_LIMIT downstream. It was submitted as https://reviews.llvm.org/D130781 but never ended up being merged.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That looks reasonable to me. Want to send it again as a PR? I think we could merge that without a test case.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nice. Please tag me on that PR if you end up opening it, @glandium. Can also assist in opening it if you don't find the cycles, I think the phabricator bug report suffices to me as well to just add it the check without a repro. |
||
| if (last_error == ERROR_NOT_ENOUGH_MEMORY || | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems fine, CC @barcharcraz @zmodem
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems fine to me to. |
||
| last_error == ERROR_INVALID_PARAMETER) | ||
| return nullptr; | ||
| ReportMmapFailureAndDie(size, mem_type, mmap_type, last_error); | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // RUN: %clangxx_asan -O0 %s -o %t | ||
| // RUN: %run %t 2>&1 | ||
|
||
| // CHECK: Success | ||
|
|
||
| #include <cstdint> | ||
| #include <cstdio> | ||
| #include <cstdlib> | ||
| #include <limits> | ||
|
|
||
| // On Windows, flags configured through the user-defined function `__asan_default_options` | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This and allocator_may_return_null_limits.cpp are really variations of the same test. I wonder if they could be folded together? For example, the
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| // are suspected to not always be honored according to this GH issue: | ||
| // https://github.com/llvm/llvm-project/issues/117925 | ||
| // This issue is resolved for the `allocator_may_return_null` flag, but not for all others. | ||
| // This test ensures we do not regress on `allocator_may_return_null` specifically. | ||
| extern "C" __declspec(dllexport) extern const char *__asan_default_options() { | ||
| return "allocator_may_return_null=1"; | ||
| } | ||
|
|
||
| int main() { | ||
| // Attempt to allocate an excessive amount of memory, which should | ||
| // terminate the program unless `allocator_may_return_null` is set. | ||
| size_t max = std::numeric_limits<size_t>::max(); | ||
|
|
||
| free(malloc(max)); | ||
| printf("Success"); | ||
| return 0; | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // RUN: %clangxx_asan -O0 %s -o %t | ||
| // RUN: %env_asan_opts=allocator_may_return_null=0 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK1 | ||
| // RUN: %env_asan_opts=allocator_may_return_null=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK2 | ||
|
|
||
| // CHECK1: exceeds maximum supported size | ||
| // CHECK1: ABORT | ||
|
|
||
| // CHECK2: Success | ||
|
|
||
| #include <cstdint> | ||
| #include <cstdio> | ||
| #include <cstdlib> | ||
| #include <limits> | ||
|
|
||
| int main() { | ||
| // Attempt to allocate an excessive amount of memory, which should | ||
| // terminate the program unless `allocator_may_return_null` is set. | ||
| size_t max = std::numeric_limits<size_t>::max(); | ||
|
|
||
| free(malloc(max)); | ||
| printf("Success"); | ||
| return 0; | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.