From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 20 Dec 2021 13:55:02 +0000 (+0100)
Subject: journal: Handle partially read HashItem's when punching holes
X-Git-Tag: v250-rc3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94c5a83c6eedec472e9867dcd55e42e9601695bc;p=thirdparty%2Fsystemd.git

journal: Handle partially read HashItem's when punching holes
---

diff --git a/src/journal/journald-file.c b/src/journal/journald-file.c
index 503900d5bc2..35ca305384e 100644
--- a/src/journal/journald-file.c
+++ b/src/journal/journald-file.c
@@ -81,7 +81,7 @@ static int journald_file_entry_array_punch_hole(JournalFile *f, uint64_t p, uint
 static int journald_file_punch_holes(JournalFile *f) {
         HashItem items[PAYLOAD_BUFFER_SIZE / sizeof(HashItem)];
         uint64_t p, sz;
-        ssize_t n;
+        ssize_t n = SSIZE_MAX;
         int r;
 
         r = journald_file_entry_array_punch_hole(
@@ -92,11 +92,14 @@ static int journald_file_punch_holes(JournalFile *f) {
         p = le64toh(f->header->data_hash_table_offset);
         sz = le64toh(f->header->data_hash_table_size);
 
-        for (uint64_t i = p; i < p + sz; i += n) {
+        for (uint64_t i = p; i < p + sz && n > 0; i += n) {
                 n = pread(f->fd, items, MIN(sizeof(items), p + sz - i), i);
                 if (n < 0)
                         return n;
 
+                /* Let's ignore any partial hash items by rounding down to the nearest multiple of HashItem. */
+                n -= n % sizeof(HashItem);
+
                 for (size_t j = 0; j < (size_t) n / sizeof(HashItem); j++) {
                         Object o;