Skip to contentSkip to conversation

systemd: backport patch to fix journal-file issue

PATCH Superseded Suresh H A 2 participants 2 messages Mar 30 – Apr 1

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Suresh H A

author
#0 lore raw

PATCH 1/1 systemd: backport patch to fix journal-file issue

From: sureshha <[email protected]>

Backport patch to fix systemd journal-file assertion on removed or corrupted files

Extracted from systemd MR:
https://github.com/systemd/systemd/pull/40378

---
 ...not-trigger-assertion-on-removed-or-.patch | 65 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_257.8.bb    |  1 +
 2 files changed, 66 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +65 -0
new file mode 100644
index 0000000000..e1bb556271
@@ -0,0 +1,65 @@
+From 1350f39db7e72116c3b2423db02da3ddc8e29082 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <[email protected]>
+Date: Sun, 18 Jan 2026 19:15:31 +0900
+Subject: [PATCH] journal-file: do not trigger assertion on removed or
+ corrupted journal file
+
+When a journal file is removed or corrupted, then the value `p`, which is
+read from Object.data.entry_offset, may be zero.
+
+Note, journal_file_move_to_object() checks the passed offset and return
+-EBADMSG if it is invalid.
+
+Fixes the issue reported at
+https://github.com/systemd/systemd/pull/40372#issuecomment-3762907261.
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/commit/112cbc37906fb97afe0ad04164262cf62d0af5e9]
+
+Comment: Patch is refreshed as per codebase of v257
+
+Signed-off-by: sureshha <[email protected]>
+---
+ src/libsystemd/sd-journal/journal-file.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
+index 08f3b82..633de5b 100644
+--- a/src/libsystemd/sd-journal/journal-file.c
++++ b/src/libsystemd/sd-journal/journal-file.c
+@@ -3305,7 +3305,9 @@ use_extra:
+
+ static int test_object_offset(JournalFile *f, uint64_t p, uint64_t needle) {
+         assert(f);
+-        assert(p > 0);
++
++        if (p <= 0)
++                return -EBADMSG;
+
+         if (p == needle)
+                 return TEST_FOUND;
+@@ -3341,7 +3343,6 @@ static int test_object_seqnum(JournalFile *f, uint64_t p, uint64_t needle) {
+         int r;
+
+         assert(f);
+-        assert(p > 0);
+
+         r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
+         if (r < 0)
+@@ -3382,7 +3383,6 @@ static int test_object_realtime(JournalFile *f, uint64_t p, uint64_t needle) {
+         int r;
+
+         assert(f);
+-        assert(p > 0);
+
+         r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
+         if (r < 0)
+@@ -3423,7 +3423,6 @@ static int test_object_monotonic(JournalFile *f, uint64_t p, uint64_t needle) {
+         int r;
+
+         assert(f);
+-        assert(p > 0);
+
+         r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
+         if (r < 0)
+--
+2.34.1
meta/recipes-core/systemd/systemd_257.8.bb +1 -0
index 549eb7fb29..a53959f816 100644
@@ -29,6 +29,7 @@ SRC_URI += " \
            file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
            file://0002-implment-systemd-sysv-install-for-OE.patch \
            file://0001-Do-not-create-var-log-README.patch \
+           file://0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch \
            "
 
 # patches needed by musl
Signature · 1 line
2.34.1
#1 lore raw
Quoted 34 lines · Suresh H A via lists.openembedded.org

From: sureshha <[email protected]>

Backport patch to fix systemd journal-file assertion on removed or corrupted files

Extracted from systemd MR:
https://github.com/systemd/systemd/pull/40378

---
 ...not-trigger-assertion-on-removed-or-.patch | 65 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_257.8.bb    |  1 +
 2 files changed, 66 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +14 -0
new file mode 100644
index 0000000000..e1bb556271
@@ -0,0 +1,65 @@
+From 1350f39db7e72116c3b2423db02da3ddc8e29082 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <[email protected]>
+Date: Sun, 18 Jan 2026 19:15:31 +0900
+Subject: [PATCH] journal-file: do not trigger assertion on removed or
+ corrupted journal file
+
+When a journal file is removed or corrupted, then the value `p`, which is
+read from Object.data.entry_offset, may be zero.
+
+Note, journal_file_move_to_object() checks the passed offset and return
+-EBADMSG if it is invalid.
+
+Fixes the issue reported at
+https://github.com/systemd/systemd/pull/40372#issuecomment-3762907261.

meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch line 24

Quoted 10 lines
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +10 -0
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/commit/112cbc37906fb97afe0ad04164262cf62d0af5e9]
+
+Comment: Patch is refreshed as per codebase of v257
+
+Signed-off-by: sureshha <[email protected]>
+---
+ src/libsystemd/sd-journal/journal-file.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+

Hello,

This patch has a weird format. Every spaces at end of line were removed, but in the empty or white space only context lines, those should be kept. Examples below:

meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch line 30

Quoted 6 lines
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +6 -0
+diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
+index 08f3b82..633de5b 100644
+--- a/src/libsystemd/sd-journal/journal-file.c
++++ b/src/libsystemd/sd-journal/journal-file.c
+@@ -3305,7 +3305,9 @@ use_extra:
+

^ Here should be a space.

meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch line 37

Quoted 7 lines
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +7 -0
+ static int test_object_offset(JournalFile *f, uint64_t p, uint64_t needle) {
+         assert(f);
+-        assert(p > 0);
++
++        if (p <= 0)
++                return -EBADMSG;
+

^ And here

Quoted 17 lines
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +17 -0
+         if (p == needle)
+                 return TEST_FOUND;
+@@ -3341,7 +3343,6 @@ static int test_object_seqnum(JournalFile *f, uint64_t p, uint64_t needle) {
+         int r;
+
+         assert(f);
+-        assert(p > 0);
+
+         r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
+         if (r < 0)
+@@ -3382,7 +3383,6 @@ static int test_object_realtime(JournalFile *f, uint64_t p, uint64_t needle) {
+         int r;
+
+         assert(f);
+-        assert(p > 0);
+
+         r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);

meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch line 64

Quoted 10 lines
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +10 -0
+         if (r < 0)
+@@ -3423,7 +3423,6 @@ static int test_object_monotonic(JournalFile *f, uint64_t p, uint64_t needle) {
+         int r;
+
+         assert(f);
+-        assert(p > 0);
+
+         r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
+         if (r < 0)
+--

^ here, the usual pattern to separate signature is "-- " (a space)
not "--" (no space)

Can you check and fix please? (also check your other patches in other branches)

Patch otherwise looks good.

Quoted 13 lines
meta/recipes-core/systemd/systemd/0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch new file +1 -0
+2.34.1
meta/recipes-core/systemd/systemd_257.8.bb +1 -0
index 549eb7fb29..a53959f816 100644
@@ -29,6 +29,7 @@ SRC_URI += " \
            file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
            file://0002-implment-systemd-sysv-install-for-OE.patch \
            file://0001-Do-not-create-var-log-README.patch \
+           file://0027-journal-file-do-not-trigger-assertion-on-removed-or-.patch \
            "
 
 # patches needed by musl
Signature · 2 lines
Yoann Congal
Smile ECS