Merge pull request #2987 from pacovn/Coverity_1473088_ovf_array_index_write

[mirror_frr.git] / lib / log.c

diff --git a/lib/log.c b/lib/log.c
index e011a78f1c3a38e4b267aab9e0a1e1f9e65ef20e..010b98478699ad082f67979c6702788a280cab58 100644 (file)
--- 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;
@@ -903,10 +908,6 @@ static const struct zebra_desc_table command_types[] = {
        DESC_ENTRY(ZEBRA_ROUTE_ADD),
        DESC_ENTRY(ZEBRA_ROUTE_DELETE),
        DESC_ENTRY(ZEBRA_ROUTE_NOTIFY_OWNER),
-       DESC_ENTRY(ZEBRA_IPV4_ROUTE_ADD),
-       DESC_ENTRY(ZEBRA_IPV4_ROUTE_DELETE),
-       DESC_ENTRY(ZEBRA_IPV6_ROUTE_ADD),
-       DESC_ENTRY(ZEBRA_IPV6_ROUTE_DELETE),
        DESC_ENTRY(ZEBRA_REDISTRIBUTE_ADD),
        DESC_ENTRY(ZEBRA_REDISTRIBUTE_DELETE),
        DESC_ENTRY(ZEBRA_REDISTRIBUTE_DEFAULT_ADD),
@@ -924,7 +925,6 @@ static const struct zebra_desc_table command_types[] = {
        DESC_ENTRY(ZEBRA_IMPORT_ROUTE_REGISTER),
        DESC_ENTRY(ZEBRA_IMPORT_ROUTE_UNREGISTER),
        DESC_ENTRY(ZEBRA_IMPORT_CHECK_UPDATE),
-       DESC_ENTRY(ZEBRA_IPV4_ROUTE_IPV6_NEXTHOP_ADD),
        DESC_ENTRY(ZEBRA_BFD_DEST_REGISTER),
        DESC_ENTRY(ZEBRA_BFD_DEST_DEREGISTER),
        DESC_ENTRY(ZEBRA_BFD_DEST_UPDATE),