From: Yusuke Nojima <nojima718@gmail.com>
Date: Sat, 29 Apr 2017 17:37:53 +0000 (+0900)
Subject: journald: fix assertion failure on journal_file_link_data. (#5843)
X-Git-Tag: v234~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b3cc0c86aeddd4615e7e28e79aa89e5b77a6507;p=thirdparty%2Fsystemd.git

journald: fix assertion failure on journal_file_link_data. (#5843)

When some error occurs during the initialization of JournalFile,
the JournalFile can be left without hash tables created.  When later
trying to append an entry to that file, the assertion in
journal_file_link_data() fails, and journald crashes.

This patch fix this issue by checking *_hash_table_size in
journal_file_verify_header().
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 14cb01a6001..243d5198d9f 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -613,6 +613,9 @@ static int journal_file_verify_header(JournalFile *f) {
                         return -EBUSY;
                 }
 
+                if (f->header->field_hash_table_size == 0 || f->header->data_hash_table_size == 0)
+                        return -EBADMSG;
+
                 /* Don't permit appending to files from the future. Because otherwise the realtime timestamps wouldn't
                  * be strictly ordered in the entries in the file anymore, and we can't have that since it breaks
                  * bisection. */