Fix nfprofile race condition and therefore replace all remaining localtime() by localtime_r()

Author: phaag

src/collector/bookkeeper.c

@@ -549,7 +549,7 @@ void UpdateBooksParam(bookkeeper_t *bookkeeper, time_t lifetime, uint64_t maxsiz
 
 void PrintBooks(bookkeeper_t *bookkeeper) {
     bookkeeper_list_t *bookkeeper_list_entry;
-    struct tm *ts;
+    struct tm ts;
     time_t t;
     char string[32];
 
@@ -570,14 +570,14 @@ void PrintBooks(bookkeeper_t *bookkeeper) {
     printf("Record sequence  : %llu\n", (unsigned long long)bookkeeper->sequence);
 
     t = bookkeeper->first;
-    ts = localtime(&t);
-    strftime(string, 31, "%Y-%m-%d %H:%M:%S", ts);
+    localtime_r(&t, &ts);
+    strftime(string, 31, "%Y-%m-%d %H:%M:%S", &ts);
     string[31] = '\0';
     printf("First           : %s\n", bookkeeper->first ? string : "<not set>");
 
     t = bookkeeper->last;
-    ts = localtime(&t);
-    strftime(string, 31, "%Y-%m-%d %H:%M:%S", ts);
+    localtime_r(&t, &ts);
+    strftime(string, 31, "%Y-%m-%d %H:%M:%S", &ts);
     string[31] = '\0';
     printf("Last            : %s\n", bookkeeper->last ? string : "<not set>");
     printf("Number of files : %llu\n", (unsigned long long)bookkeeper->numfiles);

src/collector/collector.c

@@ -417,9 +417,10 @@ int RotateCycle(const collector_ctx_t *ctx, post_args_t *post_args, time_t t_sta
 static int RunCycle(time_t t_start, const char *time_extension, const collector_ctx_t *ctx, int *pfd, int done, uint32_t creator,
                     uint32_t compression, uint32_t encryption) {
     // periodic file rotation
-    struct tm *now = localtime(&t_start);
+    struct tm now;
+    localtime_r(&t_start, &now);
     char fmt[32];
-    strftime(fmt, sizeof(fmt), time_extension, now);
+    strftime(fmt, sizeof(fmt), time_extension, &now);
 
     dbg_printf("Enter RunCycle\n");
 
@@ -431,7 +432,7 @@ static int RunCycle(time_t t_start, const char *time_extension, const collector_
         char nfcapd_filename[MAXPATHLEN];
         nfcapd_filename[0] = '\0';
 
-        int pos = SetupPath(now, fs->datadir, fs->subdir, nfcapd_filename);
+        int pos = SetupPath(&now, fs->datadir, fs->subdir, nfcapd_filename);
         char *p = nfcapd_filename + (ptrdiff_t)pos;
         snprintf(p, MAXPATHLEN - pos - 1, "nfcapd.%s", fmt);
         nfcapd_filename[MAXPATHLEN - 1] = '\0';

src/collector/expire.c

@@ -366,16 +366,16 @@ void ExpireDir(char *dir, dirstat_t *dirstat, uint64_t maxsize, uint64_t maxlife
             // this means all files will get expired - are you sure ?
             char *s, s1[32], s2[32];
             time_t t;
-            struct tm *when;
+            struct tm when;
 
             t = t_expire;
-            when = localtime(&t);
-            strftime(s1, 31, "%Y-%m-%d %H:%M:%S", when);
+            localtime_r(&t, &when);
+            strftime(s1, 31, "%Y-%m-%d %H:%M:%S", &when);
             s1[31] = '\0';
 
             t = dirstat->last;
-            when = localtime(&t);
-            strftime(s2, 31, "%Y-%m-%d %H:%M:%S", when);
+            localtime_r(&t, &when);
+            strftime(s2, 31, "%Y-%m-%d %H:%M:%S", &when);
             s2[31] = '\0';
 
             printf("Your max lifetime of %s will expire all file before %s\n", ScaleTime(maxlife), s1);

src/collector/nfstatfile.c

@@ -505,19 +505,19 @@ int ReleaseStatInfo(dirstat_t *dirstat) {
 }  // End of ReleaseStatInfo
 
 void PrintDirStat(dirstat_t *dirstat) {
-    struct tm *ts;
+    struct tm ts;
     time_t t;
     char string[32];
 
     t = dirstat->first;
-    ts = localtime(&t);
-    strftime(string, 31, "%Y-%m-%d %H:%M:%S", ts);
+    localtime_r(&t, &ts);
+    strftime(string, 31, "%Y-%m-%d %H:%M:%S", &ts);
     string[31] = '\0';
     printf("First:     %s\n", string);
 
     t = dirstat->last;
-    ts = localtime(&t);
-    strftime(string, 31, "%Y-%m-%d %H:%M:%S", ts);
+    localtime_r(&t, &ts);
+    strftime(string, 31, "%Y-%m-%d %H:%M:%S", &ts);
     string[31] = '\0';
     printf("Last:      %s\n", string);
 

src/libnfdump/tor/tor.c

@@ -70,9 +70,10 @@ int Init_TorLookup(void) {
 }  // End of Init_TorLookup
 
 static char *tmString(time_t time, char *buff, size_t len) {
-    struct tm *tmTime = localtime(&time);
-    snprintf(buff, len, "%4d-%02d-%02d %02d:%02d:%02d", tmTime->tm_year + 1900, tmTime->tm_mon + 1, tmTime->tm_mday, tmTime->tm_hour, tmTime->tm_min,
-             tmTime->tm_sec);
+    struct tm tmTime;
+    localtime_r(&time, &tmTime);
+    snprintf(buff, len, "%4d-%02d-%02d %02d:%02d:%02d", tmTime.tm_year + 1900, tmTime.tm_mon + 1, tmTime.tm_mday, tmTime.tm_hour, tmTime.tm_min,
+             tmTime.tm_sec);
     return buff;
 }
 

src/libnffile/flist.c

@@ -29,6 +29,7 @@
  *
  */
 
+#include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -1043,15 +1044,16 @@ static char *VerifyFileRange(char *path, char *last_file) {
 
 static char *GuessSubDir(char *channeldir, char *filename) {
     char s[MAXPATHLEN];
-    struct tm *t_tm;
+    struct tm t_tm = {0};
 
     dbg_printf("GuessSubDir() for file: %s in path: %s\n", filename, channeldir);
 
     size_t len = strlen(filename);
+    assert(len == 19);
     if ((len == 19 || len == 21) && (strncmp(filename, "nfcapd.", 7) == 0)) {
         char *p = &filename[7];
         time_t t = ISO2UNIX(p);
-        t_tm = localtime(&t);
+        localtime_r(&t, &t_tm);
     } else
         return NULL;
 
@@ -1062,7 +1064,7 @@ static char *GuessSubDir(char *channeldir, char *filename) {
         char const *sub_fmt = subdir_def[i];
         char subpath[255];
         struct stat stat_buf;
-        strftime(subpath, 254, sub_fmt, t_tm);
+        strftime(subpath, 254, sub_fmt, &t_tm);
         subpath[254] = '\0';
 
         snprintf(s, MAXPATHLEN - 1, "%s/%s/%s", channeldir, subpath, filename);

src/libnffile/nffile.c

@@ -1659,9 +1659,10 @@ int QueryFile(char *filename, int verbose) {
             fileHeader.creator = CREATOR_UNKNOWN;
         }
 
-        struct tm *tbuff = localtime(&fileHeader.created);
+        struct tm tbuff;
+        localtime_r(&fileHeader.created, &tbuff);
         char t1[64];
-        strftime(t1, 63, "%Y-%m-%d %H:%M:%S", tbuff);
+        strftime(t1, 63, "%Y-%m-%d %H:%M:%S", &tbuff);
         printf("Created    : %s\n", t1);
         printf("Created by : %s\n", nf_creator[fileHeader.creator]);
         printf("nfdump     : %x\n", fileHeader.nfdversion);
@@ -2101,9 +2102,10 @@ void PrintGNUplotSumStat(nffile_t *nffile) {
     if (dateString) {
         dateString += 7;
         time_t when = ISO2UNIX(dateString);
-        struct tm *ts = localtime(&when);
+        struct tm ts;
+        localtime_r(&when, &ts);
         char datestr[64];
-        strftime(datestr, 63, "%Y-%m-%d %H:%M:%S", ts);
+        strftime(datestr, 63, "%Y-%m-%d %H:%M:%S", &ts);
         printf("%s,%llu,%llu,%llu\n", datestr, (long long unsigned)nffile->stat_record->numflows, (long long unsigned)nffile->stat_record->numpackets,
                (long long unsigned)nffile->stat_record->numbytes);
     } else {

src/libnffile/output_short.c

@@ -69,27 +69,27 @@ static void stringEXgenericFlow(FILE *stream, record_map_t *r) {
     EXgenericFlow_t *genericFlow = (EXgenericFlow_t *)((void *)elementHeader + sizeof(elementHeader_t));
 
     char datestr1[64], datestr2[64], datestr3[64];
-    struct tm *ts;
+    struct tm ts;
     time_t when = genericFlow->msecFirst / 1000LL;
     if (when == 0) {
         strncpy(datestr1, "<unknown>", 63);
     } else {
-        ts = localtime(&when);
-        strftime(datestr1, 63, "%Y-%m-%d %H:%M:%S", ts);
+        localtime_r(&when, &ts);
+        strftime(datestr1, 63, "%Y-%m-%d %H:%M:%S", &ts);
     }
 
     when = genericFlow->msecLast / 1000LL;
     if (when == 0) {
         strncpy(datestr2, "<unknown>", 63);
     } else {
-        ts = localtime(&when);
-        strftime(datestr2, 63, "%Y-%m-%d %H:%M:%S", ts);
+        localtime_r(&when, &ts);
+        strftime(datestr2, 63, "%Y-%m-%d %H:%M:%S", &ts);
     }
 
     if (genericFlow->msecReceived) {
         when = genericFlow->msecReceived / 1000LL;
-        ts = localtime(&when);
-        strftime(datestr3, 63, "%Y-%m-%d %H:%M:%S", ts);
+        localtime_r(&when, &ts);
+        strftime(datestr3, 63, "%Y-%m-%d %H:%M:%S", &ts);
     } else {
         datestr3[0] = '0';
         datestr3[1] = '\0';

src/libnffile/util.c

@@ -556,22 +556,21 @@ char *TimeString(uint64_t msecStart, uint64_t msecEnd) {
 
     if (msecStart) {
         time_t secs = msecStart / 1000;
-        struct tm *tbuff = localtime(&secs);
-        if (!tbuff) {
-            LogError("localtime() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
-            return "Error time convert";
+        struct tm tbuff;
+        if (!localtime_r(&secs, &tbuff)) {
+            LogError("localtime_r() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
+            return "0000-00-00 00:00:00";
         }
         char t1[64];
-        strftime(t1, 63, "%Y-%m-%d %H:%M:%S", tbuff);
+        strftime(t1, 63, "%Y-%m-%d %H:%M:%S", &tbuff);
 
         secs = msecEnd / 1000;
-        tbuff = localtime(&secs);
-        if (!tbuff) {
-            LogError("localtime() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
-            return "Error time convert";
+        if (!localtime_r(&secs, &tbuff)) {
+            LogError("localtime_r() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
+            return "0000-00-00 00:00:00";
         }
         char t2[64];
-        strftime(t2, 63, "%Y-%m-%d %H:%M:%S", tbuff);
+        strftime(t2, 63, "%Y-%m-%d %H:%M:%S", &tbuff);
 
         snprintf(datestr, 254, "%s.%03d - %s.%03d", t1, (int)(msecStart % 1000), t2, (int)(msecEnd % 1000));
     } else {
@@ -582,87 +581,72 @@ char *TimeString(uint64_t msecStart, uint64_t msecEnd) {
 }
 
 char *UNIX2ISO(time_t t) {
-    struct tm *when;
+    struct tm when;
     static char timestring[32];
 
-    when = localtime(&t);
-    when->tm_isdst = -1;
-    snprintf(timestring, 31, "%4i%02i%02i%02i%02i%02i", when->tm_year + 1900, when->tm_mon + 1, when->tm_mday, when->tm_hour, when->tm_min,
-             when->tm_sec);
+    localtime_r(&t, &when);
+    when.tm_isdst = -1;
+    snprintf(timestring, 31, "%4i%02i%02i%02i%02i%02i", when.tm_year + 1900, when.tm_mon + 1, when.tm_mday, when.tm_hour, when.tm_min, when.tm_sec);
     timestring[31] = '\0';
 
     return timestring;
 
 }  // End of UNIX2ISO
 
-time_t ISO2UNIX(char *timestring) {
-    char c, *p;
-    struct tm when;
-    time_t t;
-
-    // let localtime fill in all default fields such as summer time, TZ etc.
-    t = time(NULL);
-    localtime_r(&t, &when);
-    when.tm_sec = 0;
-    when.tm_wday = 0;
-    when.tm_yday = 0;
-    when.tm_isdst = -1;
+// convert yyyyMMddhhmm[ss] -> time_t
+time_t ISO2UNIX(const char *timestring) {
+    if (!timestring) {
+        LogError("NULL time string");
+        return (time_t)-1;
+    }
 
     size_t len = strlen(timestring);
     if (len != 12 && len != 14) {
-        LogError("Wrong time format '%s'\n", timestring);
-        return 0;
+        LogError("Wrong time format '%s'", timestring);
+        return (time_t)-1;
     }
-    // 2019 05 05 12 00 (10)
-    // year
-    p = timestring;
-    c = p[4];
-    p[4] = '\0';
-    when.tm_year = atoi(p) - 1900;
-    p[4] = c;
-
-    // month
-    p += 4;
-    c = p[2];
-    p[2] = '\0';
-    when.tm_mon = atoi(p) - 1;
-    p[2] = c;
-
-    // day
-    p += 2;
-    c = p[2];
-    p[2] = '\0';
-    when.tm_mday = atoi(p);
-    p[2] = c;
-
-    // hour
-    p += 2;
-    c = p[2];
-    p[2] = '\0';
-    when.tm_hour = atoi(p);
-    p[2] = c;
-
-    // minute
-    p += 2;
-    c = p[2];
-    p[2] = '\0';
-    when.tm_min = atoi(p);
-    p[2] = c;
+
+    // ensure all characters are digits
+    for (size_t i = 0; i < len; i++) {
+        if (!isdigit((unsigned char)timestring[i])) {
+            LogError("Invalid character in time string '%s'", timestring);
+            return (time_t)-1;
+        }
+    }
+
+    struct tm when = {0};
+
+    // parse manually without modifying input
+    when.tm_year = (timestring[0] - '0') * 1000 + (timestring[1] - '0') * 100 + (timestring[2] - '0') * 10 + (timestring[3] - '0') - 1900;
+    when.tm_mon = ((timestring[4] - '0') * 10 + (timestring[5] - '0')) - 1;
+    when.tm_mday = (timestring[6] - '0') * 10 + (timestring[7] - '0');
+    when.tm_hour = (timestring[8] - '0') * 10 + (timestring[9] - '0');
+    when.tm_min = (timestring[10] - '0') * 10 + (timestring[11] - '0');
+    when.tm_sec = 0;
 
     if (len == 14) {
-        p += 2;
-        when.tm_sec = atoi(p);
+        when.tm_sec = (timestring[12] - '0') * 10 + (timestring[13] - '0');
     }
 
-    t = mktime(&when);
-    if (t == -1) {
-        LogError("Failed to convert string '%s'\n", timestring);
-        return 0;
-    } else {
-        // printf("%s %s", timestring, ctime(&t));
-        return t;
+    when.tm_isdst = -1;  // let mktime determine DST
+
+    // range validation
+    if (when.tm_mon < 0 || when.tm_mon > 11 || when.tm_mday < 1 || when.tm_mday > 31 || when.tm_hour < 0 || when.tm_hour > 23 || when.tm_min < 0 ||
+        when.tm_min > 59 || when.tm_sec < 0 || when.tm_sec > 60) {
+        LogError("Out-of-range values in '%s'", timestring);
+        return (time_t)-1;
+    }
+
+    // comment
+    // pthread_mutex_lock(&mktime_mutex);
+    time_t t = mktime(&when);
+    // pthread_mutex_unlock(&mktime_mutex);
+    if (t == (time_t)-1) {
+        LogError("Failed to convert string '%s'", timestring);
+        return (time_t)-1;
     }
 
+    return t;
 }  // End of ISO2UNIX
 
 long getTick(void) {

src/libnffile/util.h

@@ -140,7 +140,7 @@ char *TimeString(uint64_t msecStart, uint64_t msecEnd);
 
 char *UNIX2ISO(time_t t);
 
-time_t ISO2UNIX(char *timestring);
+time_t ISO2UNIX(const char *timestring);
 
 uint64_t ParseTime8601(const char *s);