1*4882a593SmuzhiyunFrom 56f881c5eaa3d8c02c96607c4b9e4eaf959a044d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Laszlo Varady <laszlo.varady@protonmail.com> 3*4882a593SmuzhiyunDate: Sat, 20 Aug 2022 14:30:51 +0200 4*4882a593SmuzhiyunSubject: [PATCH 8/8/] timeutils: fix out-of-bounds reading of data buffer 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunCVE: CVE-2022-38725 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUpstream-Status: Backport 12*4882a593Smuzhiyun[https://github.com/syslog-ng/syslog-ng/commit/56f881c5eaa3d8c02c96607c4b9e4eaf959a044d] 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: László Várady <laszlo.varady@protonmail.com> 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Yogita Urade <yogita.urade@windriver.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun lib/timeutils/scan-timestamp.c | 4 ++-- 19*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/lib/timeutils/scan-timestamp.c b/lib/timeutils/scan-timestamp.c 22*4882a593Smuzhiyunindex 125264677..c00d8e6a9 100644 23*4882a593Smuzhiyun--- a/lib/timeutils/scan-timestamp.c 24*4882a593Smuzhiyun+++ b/lib/timeutils/scan-timestamp.c 25*4882a593Smuzhiyun@@ -431,7 +431,7 @@ __parse_bsd_timestamp(const guchar **data, gint *length, WallClockTime *wct) 26*4882a593Smuzhiyun if (!scan_pix_timestamp((const gchar **) &src, &left, wct)) 27*4882a593Smuzhiyun return FALSE; 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun- if (*src == ':') 30*4882a593Smuzhiyun+ if (left && *src == ':') 31*4882a593Smuzhiyun { 32*4882a593Smuzhiyun src++; 33*4882a593Smuzhiyun left--; 34*4882a593Smuzhiyun@@ -482,7 +482,7 @@ scan_rfc3164_timestamp(const guchar **data, gint *length, WallClockTime *wct) 35*4882a593Smuzhiyun * looking at you, skip that as well, so we can reliably detect IPv6 36*4882a593Smuzhiyun * addresses as hostnames, which would be using ":" as well. */ 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun- if (*src == ':') 39*4882a593Smuzhiyun+ if (left && *src == ':') 40*4882a593Smuzhiyun { 41*4882a593Smuzhiyun ++src; 42*4882a593Smuzhiyun --left; 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun2.34.1 45*4882a593Smuzhiyun 46