diff --git a/SOURCES/rsyslog-8.24.0-rhbz1725067-imjournal-memleak.patch b/SOURCES/rsyslog-8.24.0-rhbz1725067-imjournal-memleak.patch new file mode 100644 index 0000000..e55df58 --- /dev/null +++ b/SOURCES/rsyslog-8.24.0-rhbz1725067-imjournal-memleak.patch @@ -0,0 +1,49 @@ +From 920c28ff705aac74f389b4613815b14b9482e497 Mon Sep 17 00:00:00 2001 +From: Jiri Vymazal +Date: Mon, 21 Jan 2019 10:58:03 +0100 +Subject: [PATCH] Added missing free() calls of received journal cursor + +--- + plugins/imjournal/imjournal.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c +index a85e521003..f5c2be4b6e 100644 +--- a/plugins/imjournal/imjournal.c ++++ b/plugins/imjournal/imjournal.c +@@ -411,8 +411,7 @@ readjournal(void) + + if (cs.bWorkAroundJournalBug) { + /* save journal cursor (at this point we can be sure it is valid) */ +- sd_journal_get_cursor(j, &c); +- if (c) { ++ if (sd_journal_get_cursor(j, &c)) { + free(last_cursor); + last_cursor = c; + } +@@ -444,7 +443,9 @@ persistJournalState(void) + if (!last_cursor) + ABORT_FINALIZE(RS_RET_OK); + } else if (trySave) { ++ free(last_cursor); + if ((ret = sd_journal_get_cursor(j, &last_cursor))) { ++ last_cursor = NULL; + LogError(-ret, RS_RET_ERR, "imjournal: sd_journal_get_cursor() failed"); + ABORT_FINALIZE(RS_RET_ERR); + } +@@ -592,6 +593,7 @@ loadJournalState(void) + iRet = RS_RET_ERR; + } + } ++ free(tmp_cursor); + } + } else { + errmsg.LogError(0, RS_RET_IO_ERROR, "imjournal: " +@@ -748,6 +750,7 @@ BEGINfreeCnf + CODESTARTfreeCnf + free(cs.stateFile); + free(cs.dfltTag); ++ free(last_cursor); + ENDfreeCnf + + /* open journal */ diff --git a/SPECS/rsyslog.spec b/SPECS/rsyslog.spec index 03afdba..f04dee2 100644 --- a/SPECS/rsyslog.spec +++ b/SPECS/rsyslog.spec @@ -14,7 +14,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.24.0 -Release: 38%{?dist} +Release: 41%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -113,6 +113,7 @@ Patch50: rsyslog-8.24.0-rhbz1632211-journal-cursor-fix.patch Patch51: rsyslog-8.24.0-rhbz1666365-internal-messages-memory-leak.patch Patch52: rsyslog-8.24.0-doc-rhbz1625935-mmkubernetes-CRI-O.patch Patch53: rsyslog-8.24.0-rhbz1656860-imfile-buffer-overflow.patch +Patch54: rsyslog-8.24.0-rhbz1725067-imjournal-memleak.patch %package crypto Summary: Encryption support @@ -416,6 +417,7 @@ mv build doc %patch51 -p1 -b .internal-msg-memleak #%patch52 is applied right after doc setup %patch53 -p1 -b .imfile-buffer-overflow +%patch54 -p1 -b .imjournal-memleak autoreconf @@ -675,6 +677,11 @@ done %{_libdir}/rsyslog/mmkubernetes.so %changelog +* Tue Jul 23 2019 Jiri Vymazal - 8.24.0-41 +RHEL 7.7.z ERRATUM +- added patch resolving memory leaks in imjournal + resolves: rhbz#1725067 + * Mon Apr 08 2019 Jiri Vymazal - 8.24.0-38 RHEL 7.7 ERRATUM - added patch increasing max path size preventing buffer overflow