Fix MaybeReenterWithoutASLR() in docker
#1985
Merged
+7
−0
Conversation
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
LebedevRI
reviewed
May 16, 2025
src/benchmark.cc
Outdated
| // otherwise we will try to reenter infinitely. | ||
| // This seems impossible, but can happen in some docker configurations. | ||
| const auto new_personality = personality(0xffffffff); | ||
| if (internal::get_as_unsigned(new_personality) != proposed_personality) |
Collaborator
There was a problem hiding this comment.
Hm, i would think we should just check that ADDR_NO_RANDOMIZE flag is now set.
Mainly, i don't think it is guaranteed that setting one flag wouldn't set/unset something else.
LebedevRI
reviewed
May 16, 2025
src/benchmark.cc
Outdated
| // Have we failed to change the personality? That may happen. | ||
| if (prev_personality == -1) return; | ||
|
|
||
| // Make sure the parsona has been updated with the no-ADLR flag, |
In some docker configurations the `personality()` function may return inconsistent results. Double check if the persona has been updated before reentering, otherwise we risk infinite loop. Fixes google#1984.
Member
|
nice catch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
In some docker configurations the
personality()function may return inconsistent results. Double check if the persona has been updated before reentering, otherwise we risk infinite loop.Fixes #1984.