diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c index e31c3407..89cab90a 100644 --- a/apache2/modsecurity.c +++ b/apache2/modsecurity.c @@ -179,7 +179,7 @@ int msr_global_mutex_lock(modsec_rec* msr, apr_global_mutex_t* lock, const char* return -1; } - int rc = apr_global_mutex_lock(msr->modsecurity->auditlog_lock); + int rc = apr_global_mutex_lock(lock); if (rc != APR_SUCCESS) msr_log(msr, 1, "Audit log: Failed to lock global mutex: %s", get_apr_error(msr->mp, rc)); return rc; } @@ -195,7 +195,7 @@ int msr_global_mutex_unlock(modsec_rec* msr, apr_global_mutex_t* lock, const cha return -1; } - int rc = apr_global_mutex_unlock(msr->modsecurity->auditlog_lock); + int rc = apr_global_mutex_unlock(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)); return rc; diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c index 8fd7e8ee..39588b10 100644 --- a/apache2/msc_logging.c +++ b/apache2/msc_logging.c @@ -1465,7 +1465,7 @@ void sec_audit_logger_json(modsec_rec *msr) { */ if (msr->txcfg->auditlog_type != AUDITLOG_CONCURRENT) { /* Unlock the mutex we used to serialise access to the audit log file. */ - msr_global_mutex_lock(msr, msr->modsecurity->auditlog_lock, "Audit log"); + msr_global_mutex_unlock(msr, msr->modsecurity->auditlog_lock, "Audit log"); return; } @@ -2236,7 +2236,7 @@ void sec_audit_logger_native(modsec_rec *msr) { if (msr->txcfg->auditlog_type != AUDITLOG_CONCURRENT) { sec_auditlog_write(msr, "\n", 1); /* Unlock the mutex we used to serialise access to the audit log file. */ - msr_global_mutex_lock(msr, msr->modsecurity->auditlog_lock, "Audit log"); + msr_global_mutex_unlock(msr, msr->modsecurity->auditlog_lock, "Audit log"); return; }