Skip to content

Commit 449c080

Browse files
author
Marc Stern
committed
Same for global_mutex_unlock
1 parent b522010 commit 449c080

File tree

4 files changed

+34
-41
lines changed

4 files changed

+34
-41
lines changed

‎apache2/modsecurity.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,22 @@ int msr_global_mutex_lock(modsec_rec* msr, apr_global_mutex_t* lock, const char*
183183
if (rc != APR_SUCCESS) msr_log(msr, 1, "Audit log: Failed to lock global mutex: %s", get_apr_error(msr->mp, rc));
184184
return rc;
185185
}
186+
/**
187+
* handle errors from apr_global_mutex_unlock
188+
*/
189+
int msr_global_mutex_unlock(modsec_rec* msr, apr_global_mutex_t* lock, const char* fct) {
190+
assert(msr);
191+
assert(msr->modsecurity); // lock is msr->modsecurity->..._lock
192+
assert(msr->mp);
193+
if (!lock) {
194+
msr_log(msr, 1, "%s: Global mutex was not created", fct);
195+
return -1;
196+
}
197+
198+
int rc = apr_global_mutex_unlock(msr->modsecurity->auditlog_lock);
199+
if (rc != APR_SUCCESS) msr_log(msr, 1, "Audit log: Failed to lock global mutex: %s", get_apr_error(msr->mp, rc));
200+
return rc;
201+
}
186202

187203
/**
188204
* Initialise the modsecurity engine. This function must be invoked

‎apache2/modsecurity.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,7 @@ struct msc_parm {
708708
/* Reusable functions */
709709
int acquire_global_lock(apr_global_mutex_t **lock, apr_pool_t *mp);
710710
int msr_global_mutex_lock(modsec_rec* msr, apr_global_mutex_t* lock, const char* fct);
711+
int msr_global_mutex_unlock(modsec_rec* msr, apr_global_mutex_t* lock, const char* fct);
711712

712713
/* Engine functions */
713714

‎apache2/msc_geo.c‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -357,13 +357,7 @@ int geo_lookup(modsec_rec *msr, geo_rec *georec, const char *target, char **erro
357357
if (rec_val == geo->ctry_offset) {
358358
*error_msg = apr_psprintf(msr->mp, "No geo data for \"%s\").", log_escape(msr->mp, target));
359359
msr_log(msr, 4, "%s", *error_msg);
360-
361-
ret = apr_global_mutex_unlock(msr->modsecurity->geo_lock);
362-
if (ret != APR_SUCCESS) {
363-
msr_log(msr, 1, "Geo Lookup: Failed to lock proc mutex: %s",
364-
get_apr_error(msr->mp, ret));
365-
}
366-
360+
msr_global_mutex_unlock(msr, msr->modsecurity->geo_lock, "Geo Lookup");
367361
return 0;
368362
}
369363

@@ -373,13 +367,7 @@ int geo_lookup(modsec_rec *msr, geo_rec *georec, const char *target, char **erro
373367
if ((country <= 0) || (country > GEO_COUNTRY_LAST)) {
374368
*error_msg = apr_psprintf(msr->mp, "No geo data for \"%s\" (country %d).", log_escape(msr->mp, target), country);
375369
msr_log(msr, 4, "%s", *error_msg);
376-
377-
ret = apr_global_mutex_unlock(msr->modsecurity->geo_lock);
378-
if (ret != APR_SUCCESS) {
379-
msr_log(msr, 1, "Geo Lookup: Failed to lock proc mutex: %s",
380-
get_apr_error(msr->mp, ret));
381-
}
382-
370+
msr_global_mutex_unlock(msr, msr->modsecurity->geo_lock, "Geo Lookup");
383371
return 0;
384372
}
385373

@@ -404,13 +392,7 @@ int geo_lookup(modsec_rec *msr, geo_rec *georec, const char *target, char **erro
404392
if ((country <= 0) || (country > GEO_COUNTRY_LAST)) {
405393
*error_msg = apr_psprintf(msr->mp, "No geo data for \"%s\" (country %d).", log_escape(msr->mp, target), country);
406394
msr_log(msr, 4, "%s", *error_msg);
407-
408-
ret = apr_global_mutex_unlock(msr->modsecurity->geo_lock);
409-
if (ret != APR_SUCCESS) {
410-
msr_log(msr, 1, "Geo Lookup: Failed to lock proc mutex: %s",
411-
get_apr_error(msr->mp, ret));
412-
}
413-
395+
msr_global_mutex_unlock(msr, msr->modsecurity->geo_lock, "Geo Lookup");
414396
return 0;
415397
}
416398
if (msr->txcfg->debuglog_level >= 9) {
@@ -499,13 +481,7 @@ int geo_lookup(modsec_rec *msr, geo_rec *georec, const char *target, char **erro
499481
}
500482

501483
*error_msg = apr_psprintf(msr->mp, "Geo lookup for \"%s\" succeeded.", log_escape(msr->mp, target));
502-
503-
ret = apr_global_mutex_unlock(msr->modsecurity->geo_lock);
504-
if (ret != APR_SUCCESS) {
505-
msr_log(msr, 1, "Geo Lookup: Failed to lock proc mutex: %s",
506-
get_apr_error(msr->mp, ret));
507-
}
508-
484+
msr_global_mutex_unlock(msr, msr->modsecurity->geo_lock, "Geo Lookup");
509485
return 1;
510486
}
511487

‎apache2/persist_dbm.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec
133133
if (rc != APR_SUCCESS) {
134134
dbm = NULL;
135135
#ifdef GLOBAL_COLLECTION_LOCK
136-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
136+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_retrieve_ex");
137137
#endif
138138
goto cleanup;
139139
}
@@ -169,7 +169,7 @@ static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec
169169
if (existing_dbm == NULL) {
170170
apr_sdbm_close(dbm);
171171
#ifdef GLOBAL_COLLECTION_LOCK
172-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
172+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_retrieve_ex");
173173
#endif
174174
dbm = NULL;
175175
}
@@ -228,7 +228,7 @@ static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec
228228
log_escape(msr->mp, dbm_filename), get_apr_error(msr->mp, rc));
229229
dbm = NULL;
230230
#ifdef GLOBAL_COLLECTION_LOCK
231-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
231+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_retrieve_ex");
232232
#endif
233233
goto cleanup;
234234
}
@@ -253,7 +253,7 @@ static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec
253253
if (existing_dbm == NULL) {
254254
apr_sdbm_close(dbm);
255255
#ifdef GLOBAL_COLLECTION_LOCK
256-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
256+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_retrieve_ex");
257257
#endif
258258
dbm = NULL;
259259
}
@@ -318,7 +318,7 @@ static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec
318318

319319
apr_sdbm_close(dbm);
320320
#ifdef GLOBAL_COLLECTION_LOCK
321-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
321+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_retrieve_ex");
322322
#endif
323323
}
324324

@@ -329,7 +329,7 @@ static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec
329329
if ((existing_dbm == NULL) && dbm) {
330330
apr_sdbm_close(dbm);
331331
#ifdef GLOBAL_COLLECTION_LOCK
332-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
332+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_retrieve_ex");
333333
#endif
334334
}
335335

@@ -461,7 +461,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) {
461461
CREATEMODE, msr->mp);
462462
if (rc != APR_SUCCESS) {
463463
#ifdef GLOBAL_COLLECTION_LOCK
464-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
464+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_store");
465465
#endif
466466
msr_log(msr, 1, "collection_store: Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
467467
get_apr_error(msr->mp, rc));
@@ -544,7 +544,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) {
544544
if (dbm != NULL) {
545545
#ifdef GLOBAL_COLLECTION_LOCK
546546
apr_sdbm_close(dbm);
547-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
547+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_store");
548548
#else
549549
apr_sdbm_unlock(dbm);
550550
apr_sdbm_close(dbm);
@@ -607,7 +607,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) {
607607
if (dbm != NULL) {
608608
#ifdef GLOBAL_COLLECTION_LOCK
609609
apr_sdbm_close(dbm);
610-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
610+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_store");
611611
#else
612612
apr_sdbm_unlock(dbm);
613613
apr_sdbm_close(dbm);
@@ -619,7 +619,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) {
619619

620620
#ifdef GLOBAL_COLLECTION_LOCK
621621
apr_sdbm_close(dbm);
622-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
622+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collection_store");
623623
#else
624624
apr_sdbm_unlock(dbm);
625625
apr_sdbm_close(dbm);
@@ -680,7 +680,7 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) {
680680
CREATEMODE, msr->mp);
681681
if (rc != APR_SUCCESS) {
682682
#ifdef GLOBAL_COLLECTION_LOCK
683-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
683+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collections_remove_stale");
684684
#endif
685685
msr_log(msr, 1, "collections_remove_stale: Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
686686
get_apr_error(msr->mp, rc));
@@ -783,7 +783,7 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) {
783783

784784
apr_sdbm_close(dbm);
785785
#ifdef GLOBAL_COLLECTION_LOCK
786-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
786+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collections_remove_stale");
787787
#endif
788788
return 1;
789789

@@ -792,7 +792,7 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) {
792792
if (dbm) {
793793
apr_sdbm_close(dbm);
794794
#ifdef GLOBAL_COLLECTION_LOCK
795-
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
795+
msr_global_mutex_unlock(msr, msr->modsecurity->dbm_lock, "collections_remove_stale");
796796
#endif
797797
}
798798

0 commit comments

Comments
 (0)