Fix crash when overcommit_memory is inaccessible #10848
Merged
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
When `/proc/sys/vm/overcommit_memory` is inaccessible, fp is NULL. `checkOvercommit` will return -1 without setting err_msg, and then the err_msg is used to print the log, crash the server. And the overcommit_memory error log will print two "WARNING", like `WARNING WARNING overcommit_memory is set to 0!`, this PR also removes the second WARNING in `checkOvercommit`. Reported in redis#10846. Fixes redis#10846
Contributor
Author
|
btw, should we add a ":" after WARNING? - serverLog(LL_WARNING,"WARNING %s", err_msg);
+ serverLog(LL_WARNING,"WARNING: %s", err_msg);the log will look like (in this PR, after patch #10841): |
Member
|
I a suggest to also set the error message variable to null when declaring it, seems safer. |
oranagra
approved these changes
Jun 11, 2022
Merged
Contributor
|
Afaict, this fix (for another problem altogether) does not address the bug my PR #10841 fixes. It should have been/should be in 7.0.2, too. |
enjoy-binbin
added a commit
to enjoy-binbin/redis
that referenced
this pull request
Jul 31, 2023
When `/proc/sys/vm/overcommit_memory` is inaccessible, fp is NULL. `checkOvercommit` will return -1 without setting err_msg, and then the err_msg is used to print the log, crash the server. Set the err_msg variables to Null when declaring it, seems safer. And the overcommit_memory error log will print two "WARNING", like `WARNING WARNING overcommit_memory is set to 0!`, this PR also removes the second WARNING in `checkOvercommit`. Reported in redis#10846. Fixes redis#10846. Introduced in redis#10636 (7.0.1)
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.
When
/proc/sys/vm/overcommit_memoryis inaccessible, fp is NULL.checkOvercommitwill return -1 without setting err_msg, and thenthe err_msg is used to print the log, crash the server.
Set the err_msg variables to Null when declaring it, seems safer.
And the overcommit_memory error log will print two "WARNING",
like
WARNING WARNING overcommit_memory is set to 0!, this PRalso removes the second WARNING in
checkOvercommit.Reported in #10846. Fixes #10846. Introduced in #10636 (7.0.1)