]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: add reproducer for SIGBUS issue caused by journal truncation 29456/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 5 Oct 2023 09:02:24 +0000 (18:02 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 6 Oct 2023 00:24:55 +0000 (09:24 +0900)
The added code fails without the previous commit.

For issue #24320.

src/libsystemd/sd-journal/test-journal-flush.c

index 497e42cc650096b0cbec1aab3cb8f8e8b03c9017..3f0783571c890ee040df63b61c5d97f8ae253476 100644 (file)
@@ -9,6 +9,7 @@
 #include "chattr-util.h"
 #include "journal-file-util.h"
 #include "journal-internal.h"
+#include "logs-show.h"
 #include "macro.h"
 #include "path-util.h"
 #include "rm-rf.h"
@@ -68,6 +69,40 @@ static void test_journal_flush_one(int argc, char *argv[]) {
                 if (++n >= limit)
                         break;
         }
+
+        if (n == 0)
+                return (void) log_tests_skipped("No journal entry found");
+
+        /* Open the new journal before archiving and offlining the file. */
+        sd_journal_close(j);
+        assert_se(sd_journal_open_directory(&j, dn, 0) >= 0);
+
+        /* Read the online journal. */
+        assert_se(sd_journal_seek_tail(j) >= 0);
+        assert_se(sd_journal_step_one(j, 0) > 0);
+        printf("current_journal: %s (%i)\n", j->current_file->path, j->current_file->fd);
+        assert_se(show_journal_entry(stdout, j, OUTPUT_EXPORT, 0, 0, NULL, NULL, NULL, &(dual_timestamp) {}, &(sd_id128_t) {}) >= 0);
+
+        uint64_t p;
+        assert_se(journal_file_tail_end_by_mmap(j->current_file, &p) >= 0);
+        for (uint64_t q = ALIGN64(p + 1); q < (uint64_t) j->current_file->last_stat.st_size; q = ALIGN64(q + 1)) {
+                Object *o;
+
+                r = journal_file_move_to_object(j->current_file, OBJECT_UNUSED, q, &o);
+                assert_se(IN_SET(r, -EBADMSG, -EADDRNOTAVAIL));
+        }
+
+        /* Archive and offline file. */
+        assert_se(journal_file_archive(new_journal, NULL) >= 0);
+        assert_se(journal_file_set_offline(new_journal, /* wait = */ true) >= 0);
+
+        /* Read the archived and offline journal. */
+        for (uint64_t q = ALIGN64(p + 1); q < (uint64_t) j->current_file->last_stat.st_size; q = ALIGN64(q + 1)) {
+                Object *o;
+
+                r = journal_file_move_to_object(j->current_file, OBJECT_UNUSED, q, &o);
+                assert_se(IN_SET(r, -EBADMSG, -EADDRNOTAVAIL, -EIDRM));
+        }
 }
 
 TEST(journal_flush) {