From b8478c14c7367c3ec5d47d2680a3390b0dedecb1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 29 Jun 2022 04:52:54 +0900 Subject: [PATCH] sd-journal: data object may be invalid after data_object_in_hash_table() Fixes a bug introduced by 578cd1855b73d2710ae14a8d77c4fac1d8ea7f48. The function `data_object_in_hash_table()` calls `journal_file_move_to_object()` with `OBJECT_DATA`. Hence, previously obtained pointer to a data object may be now invalid. Fixes #23794. --- src/libsystemd/sd-journal/journal-verify.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libsystemd/sd-journal/journal-verify.c b/src/libsystemd/sd-journal/journal-verify.c index 14954503949..03c79cea136 100644 --- a/src/libsystemd/sd-journal/journal-verify.c +++ b/src/libsystemd/sd-journal/journal-verify.c @@ -670,6 +670,11 @@ static int verify_entry( return -EBADMSG; } + /* Pointer might have moved, reposition */ + r = journal_file_move_to_object(f, OBJECT_DATA, q, &u); + if (r < 0) + return r; + r = journal_file_move_to_entry_by_offset_for_data(f, u, p, DIRECTION_DOWN, NULL, NULL); if (r < 0) return r; -- 2.47.3