0231aba5cd
This solves: systemd: line splitting via fgets() allows for state injection during daemon-reexec (CVE-2018-15686) along with some other less critical issues. See the security announcement link: https://lists.centos.org/pipermail/centos-cr-announce/2019-August/006149.html for more details. Here we rebase the patches, and fix the atrocious crime of "name of patch file doesn't match what git format-patch generates". We also squash down the meta patches which add the patches to the spec file as part of good housekeeping. Change-Id: I01a3fa329bbad541a063cb604d1756892139967f Closes-Bug: 1849200 Depends-On: https://review.opendev.org/#/c/695560 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 7cc3363381f83bb060e8e686eb64b5425f2d4409 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <7cc3363381f83bb060e8e686eb64b5425f2d4409.1574264572.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com>
|
|
References: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com>
|
|
From: slin14 <shuicheng.lin@intel.com>
|
|
Date: Thu, 9 Aug 2018 18:38:18 +0800
|
|
Subject: [PATCH 2/3] fix build error for unused variable
|
|
|
|
Signed-off-by: slin14 <shuicheng.lin@intel.com>
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
src/journal/journald-syslog.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
|
|
index 36288cb..2e49b4c 100644
|
|
--- a/src/journal/journald-syslog.c
|
|
+++ b/src/journal/journald-syslog.c
|
|
@@ -167,8 +167,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
|
|
char header_priority[DECIMAL_STR_MAX(priority) + 3], header_time[64],
|
|
header_pid[sizeof("[]: ")-1 + DECIMAL_STR_MAX(pid_t) + 1];
|
|
int n = 0;
|
|
- time_t t;
|
|
- struct tm *tm;
|
|
char *ident_buf = NULL;
|
|
|
|
assert(s);
|
|
--
|
|
1.8.3.1
|
|
|