[sanitizer_common] Return nullptr from ASan on ERROR_COMMITMENT_LIMIT#119753
Merged
vitalybuka merged 1 commit intollvm:mainfrom Dec 13, 2024
Merged
[sanitizer_common] Return nullptr from ASan on ERROR_COMMITMENT_LIMIT#119753vitalybuka merged 1 commit intollvm:mainfrom
vitalybuka merged 1 commit intollvm:mainfrom
Conversation
Member
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Mike Hommey (glandium) ChangesFull diff: https://github.com/llvm/llvm-project/pull/119753.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
index 1eef16fbde3e7d..fd0f989ee392bb 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
@@ -167,7 +167,7 @@ static void *ReturnNullptrOnOOMOrDie(uptr size, const char *mem_type,
// 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
+ // VirtualAlloc emits one of 3 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:
@@ -176,12 +176,12 @@ static void *ReturnNullptrOnOOMOrDie(uptr size, const char *mem_type,
// (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.
+ // 3. ERROR_COMMITMENT_LIMIT:
+ // VirtualAlloc will return this if e.g. the pagefile is too small to commit
+ // the requested amount of memory.
if (last_error == ERROR_NOT_ENOUGH_MEMORY ||
- last_error == ERROR_INVALID_PARAMETER)
+ last_error == ERROR_INVALID_PARAMETER ||
+ last_error == ERROR_COMMITMENT_LIMIT)
return nullptr;
ReportMmapFailureAndDie(size, mem_type, mmap_type, last_error);
}
|
Contributor
Author
|
Cc: @davidmrdavid @zmodem |
Contributor
|
Since the PR description is empty, just calling out that this is related to: #117929 (comment) |
vitalybuka
approved these changes
Dec 12, 2024
vitalybuka
reviewed
Dec 12, 2024
| if (last_error == ERROR_NOT_ENOUGH_MEMORY || | ||
| last_error == ERROR_INVALID_PARAMETER) | ||
| last_error == ERROR_INVALID_PARAMETER || | ||
| last_error == ERROR_COMMITMENT_LIMIT) |
Collaborator
There was a problem hiding this comment.
would be nice to extend a test if it's reasonably easy to reproduce
Contributor
Author
There was a problem hiding this comment.
I haven't found a trivial way to trigger it, unfortunately. At least not in the time I had to try.
Contributor
Author
|
Could you merge this for me? |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/10242 Here is the relevant piece of the build log for the reference |
Contributor
|
Interesting. @vitalybuka - is that a failure above ^ running on Windows ( I can't see to find any evidence of that)? Otherwise, I can't see why the PR would cause it, since the PR is windows specific. |
Collaborator
It's unrelated. That bot is not running Windows, and the test was not using any sanitizer. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Followup to #117929