From dbf8956dffac96d5b73e103e531629ca229ab49d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Tue, 9 Apr 2024 11:00:26 +0200 Subject: [PATCH] logger: correctly format tv_usec MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit tv_usec is an unspecified signed integer type. The format string %u assumes an unsigned int, which is incorrect. Especially on 32bit big-endian, where it can lead to invalid values. Reported-by: John Paul Adrian Glaubitz Link: https://lore.kernel.org/util-linux/afef1b770ad80d50660bb2c53a0a8330b88d1049.camel@physik.fu-berlin.de/ Signed-off-by: Thomas Weißschuh (cherry picked from commit 6227b2b0585ee2ccf224cf70c7144296a814a4ab) --- misc-utils/logger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc-utils/logger.c b/misc-utils/logger.c index e1d270de8d..e928286c2f 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -798,12 +798,12 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl) if (localtime_r(&tv.tv_sec, &tm) != NULL) { char fmt[64]; const size_t i = strftime(fmt, sizeof(fmt), - "%Y-%m-%dT%H:%M:%S.%%06u%z ", &tm); + "%Y-%m-%dT%H:%M:%S.%%06jd%z ", &tm); /* patch TZ info to comply with RFC3339 (we left SP at end) */ fmt[i - 1] = fmt[i - 2]; fmt[i - 2] = fmt[i - 3]; fmt[i - 3] = ':'; - xasprintf(&time, fmt, tv.tv_usec); + xasprintf(&time, fmt, (intmax_t) tv.tv_usec); } else err(EXIT_FAILURE, _("localtime() failed")); } else -- 2.47.3