From 2e64ec5c575a372caea9b8bfbb0bb22b384206b6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 5 Jun 2025 22:21:16 +0200 Subject: [PATCH] journal: use EBADMSG for invalid data in file mmap We must assume that any data in the mmap can change anytime because the file is deallocated or similar. Let's strictly use EBADMSG for reporting invalid file contents though (as opposed to using EINVAL if our own code passes a wrong parameter somwhere). (cherry picked from commit 7d52a608438948b523681653550bc2e90ee9dc9b) --- src/libsystemd/sd-journal/journal-file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index 7f16183f7c0..c67dbddaf76 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -1403,7 +1403,7 @@ static int journal_file_link_field( assert(offset > 0); if (o->object.type != OBJECT_FIELD) - return -EINVAL; + return -EBADMSG; m = le64toh(READ_NOW(f->header->field_hash_table_size)) / sizeof(HashItem); if (m <= 0) @@ -1448,7 +1448,7 @@ static int journal_file_link_data( assert(offset > 0); if (o->object.type != OBJECT_DATA) - return -EINVAL; + return -EBADMSG; m = le64toh(READ_NOW(f->header->data_hash_table_size)) / sizeof(HashItem); if (m <= 0) @@ -2229,7 +2229,7 @@ static int journal_file_link_entry( assert(offset > 0); if (o->object.type != OBJECT_ENTRY) - return -EINVAL; + return -EBADMSG; __atomic_thread_fence(__ATOMIC_SEQ_CST); -- 2.47.3