rpms
/
systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

systemd-252-8 

Resolves: #2173682
This commit is contained in:
Jan Macku 2023-02-27 17:36:21 +01:00
parent a8492f86d1
commit 54fa34c9c2
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0226-journal-file-Fix-return-value-in-bump_entry_array.patch Normal file
View File

@ -0,0 +1,26 @@
From acf4f21936ad6153ba53f2d798967e57473be8bc Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 23 Feb 2023 15:40:38 +0100
Subject: [PATCH] journal-file: Fix return value in bump_entry_array()
(cherry picked from commit 0399902440fbaea5b163254f70be57dbedb7131e)
Resolves: #2173682
---
src/libsystemd/sd-journal/journal-file.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
index c1ec6bb1d8..c489436a1e 100644
--- a/src/libsystemd/sd-journal/journal-file.c
+++ b/src/libsystemd/sd-journal/journal-file.c
@@ -2410,7 +2410,8 @@ static int bump_entry_array(
if (direction == DIRECTION_DOWN) {
assert(o);
- return le64toh(o->entry_array.next_entry_array_offset);
+ *ret = le64toh(o->entry_array.next_entry_array_offset);
+ return 0;
}
/* Entry array chains are a singly linked list, so to find the previous array in the chain, we have

6
systemd.spec
View File

@ -21,7 +21,7 @@
Name: systemd
Url: https://systemd.io
Version: 252
Release: 7%{?dist}
Release: 8%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager
@ -303,6 +303,7 @@ Patch0222: 0222-install-fail-early-if-specifier-expansion-failed.patch
Patch0223: 0223-test-add-coverage-for-26467.patch
Patch0224: 0224-test-add-coverage-for-24177.patch
Patch0225: 0225-logind-session-make-stopping-of-idle-session-visible.patch
Patch0226: 0226-journal-file-Fix-return-value-in-bump_entry_array.patch
# Downstream-only patches (9000–9999)
@ -1124,6 +1125,9 @@ getent passwd systemd-oom &>/dev/null || useradd -r -l -g systemd-oom -d / -s /s
%files standalone-sysusers -f .file-list-standalone-sysusers
%changelog
* Mon Feb 27 2023 systemd maintenance team <systemd-maint@redhat.com> - 252-8
- journal-file: Fix return value in bump_entry_array() (#2173682)
* Mon Feb 27 2023 systemd maintenance team <systemd-maint@redhat.com> - 252-7
- test: add coverage for #24177 (#1985288)
- logind-session: make stopping of idle session visible to admins (#2172401)