Merge pull request #2882 from qlyoung/fix-zlog-deadlock

lib: fix deadlock in log.c
FRRouting · Aug 21, 2018 · f4c28c4 · f4c28c4
2 parents 5ab5e41 + dce2036
commit f4c28c4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/log.c b/lib/log.c
@@ -868,11 +868,16 @@ int zlog_rotate(void)
 		save_errno = errno;
 		umask(oldumask);
 		if (zl->fp == NULL) {
+
+			pthread_mutex_unlock(&loglock);
+
 			flog_err_sys(
 				LIB_ERR_SYSTEM_CALL,
 				"Log rotate failed: cannot open file %s for append: %s",
 				zl->filename, safe_strerror(save_errno));
 			ret = -1;
+
+			pthread_mutex_lock(&loglock);
 		} else {
 			logfile_fd = fileno(zl->fp);
 			zl->maxlvl[ZLOG_DEST_FILE] = level;