From 62d57b9bdf82cc978f889f0118c8aa19ae999a3d Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Wed, 25 Nov 2020 15:15:13 +0100 Subject: [PATCH] Log: Fix locking during log reconfiguration The log subsystem should be locked earlier, as default_log_list() may internally manipulate with the current_log_list (if it is also a default log list). --- sysdep/unix/log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c index 44536cc9..14d18c01 100644 --- a/sysdep/unix/log.c +++ b/sysdep/unix/log.c @@ -382,12 +382,12 @@ log_switch(int initial, list *logs, const char *new_syslog_name) { struct log_config *l; + /* We should not manipulate with log list when other threads may use it */ + log_lock(); + if (!logs || EMPTY_LIST(*logs)) logs = default_log_list(initial, &new_syslog_name); - /* We shouldn't close the logs when other threads may use them */ - log_lock(); - /* Close the logs to avoid pinning them on disk when deleted */ if (current_log_list) WALK_LIST(l, *current_log_list)