X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournal-verify.c;h=f9a930e42eac05d4f08cbf8549e7cf615e27220f;hp=8eefb841b2e29f1acc39cbfbc6bf2d4383aac4ef;hb=6c7be122acd666d4e93541179d89747aa12efb67;hpb=31094aae09dd5a773e1634334bcd12fc8834a030 diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c index 8eefb841b..f9a930e42 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -35,11 +35,8 @@ /* FIXME: * - * - write tag only if non-tag objects have been written * - write bit mucking test - * - tag timestamps should be between entry timestamps - * - output validated time ranges - * - add missing fields to journal header dump + * - evolve key even if nothing happened in regular intervals * * - Allow building without libgcrypt * - check with sparse @@ -290,7 +287,7 @@ static int entry_points_to_data( if (le64toh(o->entry_array.items[j]) == entry_p) return 0; - a = le64toh(o->entry_array.next_entry_array_offset);; + a = le64toh(o->entry_array.next_entry_array_offset); } return 0; @@ -326,12 +323,12 @@ static int verify_data( uint64_t next, m, j; if (a == 0) { - log_error("Array chain too short at %llu.", (unsigned long long) p); + log_error("Array chain too short at %llu", (unsigned long long) p); return -EBADMSG; } if (!contains_uint64(f->mmap, entry_array_fd, n_entry_arrays, a)) { - log_error("Invalid array at %llu.", (unsigned long long) p); + log_error("Invalid array at %llu", (unsigned long long) p); return -EBADMSG; } @@ -341,7 +338,7 @@ static int verify_data( next = le64toh(o->entry_array.next_entry_array_offset); if (next != 0 && next <= a) { - log_error("Array chain has cycle at %llu.", (unsigned long long) p); + log_error("Array chain has cycle at %llu", (unsigned long long) p); return -EBADMSG; } @@ -350,7 +347,7 @@ static int verify_data( q = le64toh(o->entry_array.items[j]); if (q <= last) { - log_error("Data object's entry array not sorted at %llu.", (unsigned long long) p); + log_error("Data object's entry array not sorted at %llu", (unsigned long long) p); return -EBADMSG; } last = q; @@ -399,7 +396,7 @@ static int verify_hash_table( uint64_t next; if (!contains_uint64(f->mmap, data_fd, n_data, p)) { - log_error("Invalid data object at hash entry %llu of %llu.", + log_error("Invalid data object at hash entry %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } @@ -410,13 +407,13 @@ static int verify_hash_table( next = le64toh(o->data.next_hash_offset); if (next != 0 && next <= p) { - log_error("Hash chain has a cycle in hash entry %llu of %llu.", + log_error("Hash chain has a cycle in hash entry %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } if (le64toh(o->data.hash) % n != i) { - log_error("Hash value mismatch in hash entry %llu of %llu.", + log_error("Hash value mismatch in hash entry %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } @@ -430,7 +427,7 @@ static int verify_hash_table( } if (last != le64toh(f->data_hash_table[i].tail_hash_offset)) { - log_error("Tail hash pointer mismatch in hash table."); + log_error("Tail hash pointer mismatch in hash table"); return -EBADMSG; } } @@ -484,8 +481,8 @@ static int verify_entry( h = le64toh(o->entry.items[i].hash); if (!contains_uint64(f->mmap, data_fd, n_data, q)) { - log_error("Invalid data object at entry %llu.", - (unsigned long long) o); + log_error("Invalid data object at entry %llu", + (unsigned long long) p); return -EBADMSG; } @@ -494,7 +491,7 @@ static int verify_entry( return r; if (le64toh(u->data.hash) != h) { - log_error("Hash mismatch for data object at entry %llu.", + log_error("Hash mismatch for data object at entry %llu", (unsigned long long) p); return -EBADMSG; } @@ -503,7 +500,7 @@ static int verify_entry( if (r < 0) return r; if (r == 0) { - log_error("Data object missing from hash at entry %llu.", + log_error("Data object missing from hash at entry %llu", (unsigned long long) p); return -EBADMSG; } @@ -537,13 +534,13 @@ static int verify_entry_array( draw_progress(0x8000 + (0x3FFF * i / n), last_usec); if (a == 0) { - log_error("Array chain too short at %llu of %llu.", + log_error("Array chain too short at %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } if (!contains_uint64(f->mmap, entry_array_fd, n_entry_arrays, a)) { - log_error("Invalid array at %llu of %llu.", + log_error("Invalid array at %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } @@ -554,7 +551,7 @@ static int verify_entry_array( next = le64toh(o->entry_array.next_entry_array_offset); if (next != 0 && next <= a) { - log_error("Array chain has cycle at %llu of %llu.", + log_error("Array chain has cycle at %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } @@ -565,14 +562,14 @@ static int verify_entry_array( p = le64toh(o->entry_array.items[j]); if (p <= last) { - log_error("Entry array not sorted at %llu of %llu.", + log_error("Entry array not sorted at %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } last = p; if (!contains_uint64(f->mmap, entry_fd, n_entries, p)) { - log_error("Invalid array entry at %llu of %llu.", + log_error("Invalid array entry at %llu of %llu", (unsigned long long) i, (unsigned long long) n); return -EBADMSG; } @@ -647,16 +644,19 @@ static int journal_file_parse_verification_key(JournalFile *f, const char *key) f->fsprg_seed = seed; f->fsprg_seed_size = seed_size; - f->fss_start_usec = start; + f->fss_start_usec = start * interval; f->fss_interval_usec = interval; return 0; } -int journal_file_verify(JournalFile *f, const char *key) { +int journal_file_verify( + JournalFile *f, + const char *key, + usec_t *first_validated, usec_t *last_validated, usec_t *last_contained) { int r; Object *o; - uint64_t p = 0, last_tag = 0, last_epoch = 0; + uint64_t p = 0, last_tag = 0, last_epoch = 0, last_tag_realtime = 0; uint64_t entry_seqnum = 0, entry_monotonic = 0, entry_realtime = 0; sd_id128_t entry_boot_id; bool entry_seqnum_set = false, entry_monotonic_set = false, entry_realtime_set = false, found_main_entry_array = false; @@ -715,7 +715,7 @@ int journal_file_verify(JournalFile *f, const char *key) { } if (le64toh(f->header->tail_object_offset) < p) { - log_error("Invalid tail object pointer."); + log_error("Invalid tail object pointer"); r = -EBADMSG; goto fail; } @@ -730,7 +730,7 @@ int journal_file_verify(JournalFile *f, const char *key) { if (o->object.flags & OBJECT_COMPRESSED && !(le32toh(f->header->incompatible_flags) & HEADER_INCOMPATIBLE_COMPRESSED)) { - log_error("Compressed object without compression at %llu", (unsigned long long) p); + log_error("Compressed object in file without compression at %llu", (unsigned long long) p); r = -EBADMSG; goto fail; } @@ -750,13 +750,25 @@ int journal_file_verify(JournalFile *f, const char *key) { break; case OBJECT_ENTRY: + if ((le32toh(f->header->compatible_flags) & HEADER_COMPATIBLE_SEALED) && n_tags <= 0) { + log_error("First entry before first tag at %llu", (unsigned long long) p); + r = -EBADMSG; + goto fail; + } + r = write_uint64(entry_fd, p); if (r < 0) goto fail; + if (last_tag_realtime > le64toh(o->entry.realtime)) { + log_error("Older entry after newer tag at %llu", (unsigned long long) p); + r = -EBADMSG; + goto fail; + } + if (!entry_seqnum_set && le64toh(o->entry.seqnum) != le64toh(f->header->head_entry_seqnum)) { - log_error("Head entry sequence number incorrect"); + log_error("Head entry sequence number incorrect at %llu", (unsigned long long) p); r = -EBADMSG; goto fail; } @@ -805,7 +817,7 @@ int journal_file_verify(JournalFile *f, const char *key) { if (le64toh(f->header->data_hash_table_offset) != p + offsetof(HashTableObject, items) || le64toh(f->header->data_hash_table_size) != le64toh(o->object.size) - offsetof(HashTableObject, items)) { - log_error("Header fields for data hash table invalid."); + log_error("Header fields for data hash table invalid"); r = -EBADMSG; goto fail; } @@ -822,7 +834,7 @@ int journal_file_verify(JournalFile *f, const char *key) { if (le64toh(f->header->field_hash_table_offset) != p + offsetof(HashTableObject, items) || le64toh(f->header->field_hash_table_size) != le64toh(o->object.size) - offsetof(HashTableObject, items)) { - log_error("Header fields for field hash table invalid."); + log_error("Header fields for field hash table invalid"); r = -EBADMSG; goto fail; } @@ -849,14 +861,16 @@ int journal_file_verify(JournalFile *f, const char *key) { break; case OBJECT_TAG: { - uint64_t q; + uint64_t q, rt; if (!(le32toh(f->header->compatible_flags) & HEADER_COMPATIBLE_SEALED)) { - log_error("Tag object without sealing at %llu", (unsigned long long) p); + log_error("Tag object in file without sealing at %llu", (unsigned long long) p); r = -EBADMSG; goto fail; } + log_debug("Checking tag %llu..", (unsigned long long) le64toh(o->tag.seqnum)); + if (le64toh(o->tag.seqnum) != n_tags + 1) { log_error("Tag sequence number out of synchronization at %llu", (unsigned long long) p); r = -EBADMSG; @@ -869,6 +883,13 @@ int journal_file_verify(JournalFile *f, const char *key) { goto fail; } + rt = (o->tag.epoch + 1) * f->fss_interval_usec + f->fss_start_usec; + if (entry_realtime_set && entry_realtime >= rt) { + log_error("Tag/entry realtime timestamp out of synchronization at %llu", (unsigned long long) p); + r = -EBADMSG; + goto fail; + } + /* OK, now we know the epoch. So let's now set * it, and calculate the HMAC for everything * since the last tag. */ @@ -915,6 +936,8 @@ int journal_file_verify(JournalFile *f, const char *key) { f->hmac_running = false; last_tag = p + ALIGN64(le64toh(o->object.size)); + last_tag_realtime = rt; + n_tags ++; break; } @@ -1042,6 +1065,13 @@ int journal_file_verify(JournalFile *f, const char *key) { close_nointr_nofail(entry_fd); close_nointr_nofail(entry_array_fd); + if (first_validated) + *first_validated = le64toh(f->header->head_entry_realtime); + if (last_validated) + *last_validated = last_tag_realtime; + if (last_contained) + *last_contained = le64toh(f->header->tail_entry_realtime); + return 0; fail: