Version in base suite: 8.2302.0-1 Base version: rsyslog_8.2302.0-1 Target version: rsyslog_8.2302.0-1+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/r/rsyslog/rsyslog_8.2302.0-1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/r/rsyslog/rsyslog_8.2302.0-1+deb12u1.dsc changelog | 11 ++++++++++ gbp.conf | 2 - patches/Fix-runConf-NULL-pointer-refence.patch | 27 +++++++++++++++++++++++++ patches/series | 1 4 files changed, 40 insertions(+), 1 deletion(-) diff -Nru rsyslog-8.2302.0/debian/changelog rsyslog-8.2302.0/debian/changelog --- rsyslog-8.2302.0/debian/changelog 2023-02-22 19:43:00.000000000 +0000 +++ rsyslog-8.2302.0/debian/changelog 2025-01-08 18:13:05.000000000 +0000 @@ -1,3 +1,14 @@ +rsyslog (8.2302.0-1+deb12u1) bookworm; urgency=medium + + * Fix runConf NULL pointer reference. + If rsyslogd hasn't fully parsed its configuration, runConf will be NULL. + Receiving a SIGTERM at this point will trigger a segmentation fault. + So check the pointer before referencing it to allow for a clean restart. + Patch cherry-picked from upstream Git. (Closes: #1092450) + * Switch debian-branch to debian/bookworm + + -- Michael Biebl Wed, 08 Jan 2025 19:13:05 +0100 + rsyslog (8.2302.0-1) unstable; urgency=medium * New upstream version 8.2302.0 diff -Nru rsyslog-8.2302.0/debian/gbp.conf rsyslog-8.2302.0/debian/gbp.conf --- rsyslog-8.2302.0/debian/gbp.conf 2023-02-22 19:43:00.000000000 +0000 +++ rsyslog-8.2302.0/debian/gbp.conf 2025-01-08 18:13:05.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] pristine-tar = True patch-numbers = False -debian-branch = debian/master +debian-branch = debian/bookworm upstream-branch = upstream/latest diff -Nru rsyslog-8.2302.0/debian/patches/Fix-runConf-NULL-pointer-refence.patch rsyslog-8.2302.0/debian/patches/Fix-runConf-NULL-pointer-refence.patch --- rsyslog-8.2302.0/debian/patches/Fix-runConf-NULL-pointer-refence.patch 1970-01-01 00:00:00.000000000 +0000 +++ rsyslog-8.2302.0/debian/patches/Fix-runConf-NULL-pointer-refence.patch 2025-01-08 18:13:05.000000000 +0000 @@ -0,0 +1,27 @@ +From: Wang Haitao <45086632+apple-ouyang@users.noreply.github.com> +Date: Fri, 20 Sep 2024 17:50:37 +0800 +Subject: Fix runConf NULL pointer refence + +`systemd restart rsyslog` in the early start of OS will let rsyslog segmentation fault. +This cmd will send sigTerm to rsylogd, and rsyslogd will handle the signal in rsyslogdDoDie. +If the rsyslogd havn't parse the conf, the runConf will be NULL +So check the pointer before reference it. + +(cherry picked from commit d38e4b7bfc5bd0137914859837dcc04076b9e1ea) +--- + tools/rsyslogd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c +index 77d814b..e46c723 100644 +--- a/tools/rsyslogd.c ++++ b/tools/rsyslogd.c +@@ -1834,7 +1834,7 @@ rsyslogdDoDie(int sig) + abort(); + } + bFinished = sig; +- if(runConf->globals.debugOnShutdown) { ++ if(runConf && runConf->globals.debugOnShutdown) { + /* kind of hackish - set to 0, so that debug_swith will enable + * and AND emit the "start debug log" message. + */ diff -Nru rsyslog-8.2302.0/debian/patches/series rsyslog-8.2302.0/debian/patches/series --- rsyslog-8.2302.0/debian/patches/series 2023-02-22 19:43:00.000000000 +0000 +++ rsyslog-8.2302.0/debian/patches/series 2025-01-08 18:13:05.000000000 +0000 @@ -1,2 +1,3 @@ Don-t-create-a-database.patch Increase-timeouts-in-imfile-basic-2GB-file-and-imfile-tru.patch +Fix-runConf-NULL-pointer-refence.patch