msr_global_mutex_lock: handle errors from apr_global_mutex_lock #3257
Conversation
This file contains 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
|
|
#3255 acknowledged to be solved by the PR |
theseion
requested changes
Sep 22, 2024
| } | ||
|
|
||
| int rc = apr_global_mutex_unlock(msr->modsecurity->auditlog_lock); | ||
| // We should have get the warning at lock time, so ignore it here |
There was a problem hiding this comment.
Suggested change
| // We should have get the warning at lock time, so ignore it here | |
| // We should have been warnend during lock acquisition already, so don't log the same warning here |
|
|
||
| int rc = apr_global_mutex_unlock(msr->modsecurity->auditlog_lock); | ||
| // We should have get the warning at lock time, so ignore it here | ||
| // if (rc != APR_SUCCESS) msr_log(msr, 1, "Audit log: Failed to unlock global mutex: %s", get_apr_error(msr->mp, rc)); |
There was a problem hiding this comment.
Suggested change
| // if (rc != APR_SUCCESS) msr_log(msr, 1, "Audit log: Failed to unlock global mutex: %s", get_apr_error(msr->mp, rc)); |
| assert(msr->modsecurity); // lock is msr->modsecurity->..._lock | ||
| assert(msr->mp); | ||
| if (!lock) { | ||
| msr_log(msr, 1, "%s: Global mutex was not created", fct); |
There was a problem hiding this comment.
Suggested change
| msr_log(msr, 1, "%s: Global mutex was not created", fct); | |
| msr_log(msr, 1, "%s: Global mutex not initialised", fct); |
| assert(msr->modsecurity); // lock is msr->modsecurity->..._lock | ||
| assert(msr->mp); | ||
| if (!lock) { | ||
| msr_log(msr, 1, "%s: Global mutex was not created", fct); |
There was a problem hiding this comment.
Suggested change
| msr_log(msr, 1, "%s: Global mutex was not created", fct); | |
| msr_log(msr, 1, "%s: Global mutex not initialised", fct); |
|
Before we merge, I want to check why the lock acquire was failed (see #3255 - the user reported that this issue came with the new version where we introduced this method). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
apr_global_mutex_lockis sometimes called with a lock that wasn't created (for any reason).In this case, the pointer is null and
apr_global_mutex_lockdereferences a null pointer, leading to a crash.This PR creates a wrapper around
apr_global_mutex_lockto handle checking that and correct logging.Same for
msr_global_mutex_unlock.