From: Zbigniew Jędrzejewski-Szmek Date: Thu, 24 May 2018 06:37:47 +0000 (+0200) Subject: shared/logs-show: be more careful before using a _SOURCE_REALTIME_TIMESTAMP entry X-Git-Tag: v239~172^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03d1319b12b073979b900ebea72e7e0bc8bb8b9c;p=thirdparty%2Fsystemd.git shared/logs-show: be more careful before using a _SOURCE_REALTIME_TIMESTAMP entry journalctl -o short would display those entries, but journalctl -o short-full would refuse. If the entry is bad, just fall back to the receive-side realtime timestamp like we would if it was completely missing. --- diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 401f3630527..739af3986d3 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -293,10 +293,9 @@ static int output_timestamp_realtime(FILE *f, sd_journal *j, OutputMode mode, Ou assert(f); assert(j); - r = -ENXIO; if (realtime) r = safe_atou64(realtime, &x); - if (r < 0) + if (!realtime || r < 0 || !VALID_REALTIME(x)) r = sd_journal_get_realtime_usec(j, &x); if (r < 0) return log_error_errno(r, "Failed to get realtime timestamp: %m"); @@ -417,7 +416,6 @@ static int output_short( sd_journal_set_data_threshold(j, flags & (OUTPUT_SHOW_ALL|OUTPUT_FULL_WIDTH) ? 0 : PRINT_CHAR_THRESHOLD + 1); JOURNAL_FOREACH_DATA_RETVAL(j, data, length, r) { - r = parse_fieldv(data, length, fields, ELEMENTSOF(fields)); if (r < 0) return r; diff --git a/test/fuzz-regressions/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 b/test/fuzz-regressions/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 new file mode 100644 index 00000000000..e6a7316805d Binary files /dev/null and b/test/fuzz-regressions/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 differ