From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 21 Aug 2018 15:15:38 +0000 (+0000)
Subject: lib: fix deadlock in log.c
X-Git-Tag: frr-6.1-dev~44^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=dce2036b6addc24c675d8ec2cd5dd30293bb2b81;p=mirror%2Ffrr.git

lib: fix deadlock in log.c

Daemons could deadlock when log file could not be opened during a log
rotation.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/lib/log.c b/lib/log.c
index e011a78f1c..361521f568 100644
--- 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;