1From bff52d96598956163d73b7c7bdec7b0ad5b3c2d4 Mon Sep 17 00:00:00 2001 2From: Hitendra Prajapati <hprajapati@mvista.com> 3Date: Tue, 15 Nov 2022 16:52:03 +0530 4Subject: [PATCH] CVE-2022-3821 5 6Upstream-Status: Backport [https://github.com/systemd/systemd-stable/commit/72d4c15a946d20143cd4c6783c802124bc894dc7] 7CVE: CVE-2022-3821 8Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> 9--- 10 src/basic/time-util.c | 2 +- 11 src/test/test-time-util.c | 5 +++++ 12 2 files changed, 6 insertions(+), 1 deletion(-) 13 14diff --git a/src/basic/time-util.c b/src/basic/time-util.c 15index b659d6905d..89dc593d44 100644 16--- a/src/basic/time-util.c 17+++ b/src/basic/time-util.c 18@@ -588,7 +588,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) { 19 t = b; 20 } 21 22- n = MIN((size_t) k, l); 23+ n = MIN((size_t) k, l-1); 24 25 l -= n; 26 p += n; 27diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c 28index 4d0131827e..8db6b25279 100644 29--- a/src/test/test-time-util.c 30+++ b/src/test/test-time-util.c 31@@ -238,6 +238,11 @@ TEST(format_timespan) { 32 test_format_timespan_accuracy(1); 33 test_format_timespan_accuracy(USEC_PER_MSEC); 34 test_format_timespan_accuracy(USEC_PER_SEC); 35+ 36+ /* See issue #23928. */ 37+ _cleanup_free_ char *buf; 38+ assert_se(buf = new(char, 5)); 39+ assert_se(buf == format_timespan(buf, 5, 100005, 1000)); 40 } 41 42 TEST(verify_timezone) { 43-- 442.25.1 45 46