|
 |
923a60 |
From 2a9dd5375b4f35a101d6ef3deb035d901d7a2392 Mon Sep 17 00:00:00 2001
|
|
|
923a60 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
923a60 |
Date: Fri, 24 Jul 2015 02:18:13 +0200
|
|
|
923a60 |
Subject: [PATCH] journal: uppercase first character in verify error messages
|
|
|
923a60 |
|
|
|
923a60 |
In the english language the first character of a sentence is supposed to
|
|
|
923a60 |
be uppercase. Let's make sure this also applies to the journal
|
|
|
923a60 |
verification error messages.
|
|
|
923a60 |
|
|
|
923a60 |
Cherry-picked from: e80acc51aeaf2d74cb4d6cecbcb6e18f74c22c05
|
|
|
923a60 |
Related: #1350232
|
|
|
923a60 |
---
|
|
|
923a60 |
src/journal/journal-verify.c | 162 ++++++++++++++++-------------------
|
|
|
923a60 |
1 file changed, 75 insertions(+), 87 deletions(-)
|
|
|
923a60 |
|
|
|
923a60 |
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
|
|
|
923a60 |
index 77fb4090da..8a66ac7f08 100644
|
|
|
923a60 |
--- a/src/journal/journal-verify.c
|
|
|
923a60 |
+++ b/src/journal/journal-verify.c
|
|
|
923a60 |
@@ -135,15 +135,15 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
int compression, r;
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(o->data.entry_offset) == 0)
|
|
|
923a60 |
- warning(offset, "unused data (entry_offset==0)");
|
|
|
923a60 |
+ warning(offset, "Unused data (entry_offset==0)");
|
|
|
923a60 |
|
|
|
923a60 |
if ((le64toh(o->data.entry_offset) == 0) ^ (le64toh(o->data.n_entries) == 0)) {
|
|
|
923a60 |
- error(offset, "bad n_entries: %"PRIu64, o->data.n_entries);
|
|
|
923a60 |
+ error(offset, "Bad n_entries: %"PRIu64, o->data.n_entries);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(o->object.size) - offsetof(DataObject, payload) <= 0) {
|
|
|
923a60 |
- error(offset, "bad object size (<= %zu): %"PRIu64,
|
|
|
923a60 |
+ error(offset, "Bad object size (<= %zu): %"PRIu64,
|
|
|
923a60 |
offsetof(DataObject, payload),
|
|
|
923a60 |
le64toh(o->object.size));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
@@ -171,7 +171,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
|
|
|
923a60 |
|
|
|
923a60 |
if (h1 != h2) {
|
|
|
923a60 |
- error(offset, "invalid hash (%08"PRIx64" vs. %08"PRIx64, h1, h2);
|
|
|
923a60 |
+ error(offset, "Invalid hash (%08"PRIx64" vs. %08"PRIx64, h1, h2);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -179,7 +179,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
!VALID64(o->data.next_field_offset) ||
|
|
|
923a60 |
!VALID64(o->data.entry_offset) ||
|
|
|
923a60 |
!VALID64(o->data.entry_array_offset)) {
|
|
|
923a60 |
- error(offset, "invalid offset (next_hash_offset="OFSfmt", next_field_offset="OFSfmt", entry_offset="OFSfmt", entry_array_offset="OFSfmt,
|
|
|
923a60 |
+ error(offset, "Invalid offset (next_hash_offset="OFSfmt", next_field_offset="OFSfmt", entry_offset="OFSfmt", entry_array_offset="OFSfmt,
|
|
|
923a60 |
o->data.next_hash_offset,
|
|
|
923a60 |
o->data.next_field_offset,
|
|
|
923a60 |
o->data.entry_offset,
|
|
|
923a60 |
@@ -193,7 +193,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
case OBJECT_FIELD:
|
|
|
923a60 |
if (le64toh(o->object.size) - offsetof(FieldObject, payload) <= 0) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "bad field size (<= %zu): %"PRIu64,
|
|
|
923a60 |
+ "Bad field size (<= %zu): %"PRIu64,
|
|
|
923a60 |
offsetof(FieldObject, payload),
|
|
|
923a60 |
le64toh(o->object.size));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
@@ -202,7 +202,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if (!VALID64(o->field.next_hash_offset) ||
|
|
|
923a60 |
!VALID64(o->field.head_data_offset)) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid offset (next_hash_offset="OFSfmt", head_data_offset="OFSfmt,
|
|
|
923a60 |
+ "Invalid offset (next_hash_offset="OFSfmt", head_data_offset="OFSfmt,
|
|
|
923a60 |
o->field.next_hash_offset,
|
|
|
923a60 |
o->field.head_data_offset);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
@@ -212,7 +212,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
case OBJECT_ENTRY:
|
|
|
923a60 |
if ((le64toh(o->object.size) - offsetof(EntryObject, items)) % sizeof(EntryItem) != 0) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "bad entry size (<= %zu): %"PRIu64,
|
|
|
923a60 |
+ "Bad entry size (<= %zu): %"PRIu64,
|
|
|
923a60 |
offsetof(EntryObject, items),
|
|
|
923a60 |
le64toh(o->object.size));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
@@ -220,28 +220,28 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
|
|
|
923a60 |
if ((le64toh(o->object.size) - offsetof(EntryObject, items)) / sizeof(EntryItem) <= 0) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid number items in entry: %"PRIu64,
|
|
|
923a60 |
+ "Invalid number items in entry: %"PRIu64,
|
|
|
923a60 |
(le64toh(o->object.size) - offsetof(EntryObject, items)) / sizeof(EntryItem));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(o->entry.seqnum) <= 0) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid entry seqnum: %"PRIx64,
|
|
|
923a60 |
+ "Invalid entry seqnum: %"PRIx64,
|
|
|
923a60 |
le64toh(o->entry.seqnum));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!VALID_REALTIME(le64toh(o->entry.realtime))) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid entry realtime timestamp: %"PRIu64,
|
|
|
923a60 |
+ "Invalid entry realtime timestamp: %"PRIu64,
|
|
|
923a60 |
le64toh(o->entry.realtime));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!VALID_MONOTONIC(le64toh(o->entry.monotonic))) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid entry monotonic timestamp: %"PRIu64,
|
|
|
923a60 |
+ "Invalid entry monotonic timestamp: %"PRIu64,
|
|
|
923a60 |
le64toh(o->entry.monotonic));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -250,7 +250,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if (o->entry.items[i].object_offset == 0 ||
|
|
|
923a60 |
!VALID64(o->entry.items[i].object_offset)) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid entry item (%"PRIu64"/%"PRIu64" offset: "OFSfmt,
|
|
|
923a60 |
+ "Invalid entry item (%"PRIu64"/%"PRIu64" offset: "OFSfmt,
|
|
|
923a60 |
i, journal_file_entry_n_items(o),
|
|
|
923a60 |
o->entry.items[i].object_offset);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
@@ -264,7 +264,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if ((le64toh(o->object.size) - offsetof(HashTableObject, items)) % sizeof(HashItem) != 0 ||
|
|
|
923a60 |
(le64toh(o->object.size) - offsetof(HashTableObject, items)) / sizeof(HashItem) <= 0) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid %s hash table size: %"PRIu64,
|
|
|
923a60 |
+ "Invalid %s hash table size: %"PRIu64,
|
|
|
923a60 |
o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
|
|
|
923a60 |
le64toh(o->object.size));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
@@ -274,7 +274,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if (o->hash_table.items[i].head_hash_offset != 0 &&
|
|
|
923a60 |
!VALID64(le64toh(o->hash_table.items[i].head_hash_offset))) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid %s hash table item (%"PRIu64"/%"PRIu64") head_hash_offset: "OFSfmt,
|
|
|
923a60 |
+ "Invalid %s hash table item (%"PRIu64"/%"PRIu64") head_hash_offset: "OFSfmt,
|
|
|
923a60 |
o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
|
|
|
923a60 |
i, journal_file_hash_table_n_items(o),
|
|
|
923a60 |
le64toh(o->hash_table.items[i].head_hash_offset));
|
|
|
923a60 |
@@ -283,7 +283,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if (o->hash_table.items[i].tail_hash_offset != 0 &&
|
|
|
923a60 |
!VALID64(le64toh(o->hash_table.items[i].tail_hash_offset))) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid %s hash table item (%"PRIu64"/%"PRIu64") tail_hash_offset: "OFSfmt,
|
|
|
923a60 |
+ "Invalid %s hash table item (%"PRIu64"/%"PRIu64") tail_hash_offset: "OFSfmt,
|
|
|
923a60 |
o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
|
|
|
923a60 |
i, journal_file_hash_table_n_items(o),
|
|
|
923a60 |
le64toh(o->hash_table.items[i].tail_hash_offset));
|
|
|
923a60 |
@@ -293,7 +293,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if ((o->hash_table.items[i].head_hash_offset != 0) !=
|
|
|
923a60 |
(o->hash_table.items[i].tail_hash_offset != 0)) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid %s hash table item (%"PRIu64"/%"PRIu64"): head_hash_offset="OFSfmt" tail_hash_offset="OFSfmt,
|
|
|
923a60 |
+ "Invalid %s hash table item (%"PRIu64"/%"PRIu64"): head_hash_offset="OFSfmt" tail_hash_offset="OFSfmt,
|
|
|
923a60 |
o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
|
|
|
923a60 |
i, journal_file_hash_table_n_items(o),
|
|
|
923a60 |
le64toh(o->hash_table.items[i].head_hash_offset),
|
|
|
923a60 |
@@ -308,14 +308,14 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if ((le64toh(o->object.size) - offsetof(EntryArrayObject, items)) % sizeof(le64_t) != 0 ||
|
|
|
923a60 |
(le64toh(o->object.size) - offsetof(EntryArrayObject, items)) / sizeof(le64_t) <= 0) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid object entry array size: %"PRIu64,
|
|
|
923a60 |
+ "Invalid object entry array size: %"PRIu64,
|
|
|
923a60 |
le64toh(o->object.size));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!VALID64(o->entry_array.next_entry_array_offset)) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid object entry array next_entry_array_offset: "OFSfmt,
|
|
|
923a60 |
+ "Invalid object entry array next_entry_array_offset: "OFSfmt,
|
|
|
923a60 |
o->entry_array.next_entry_array_offset);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -324,7 +324,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
if (le64toh(o->entry_array.items[i]) != 0 &&
|
|
|
923a60 |
!VALID64(le64toh(o->entry_array.items[i]))) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt,
|
|
|
923a60 |
+ "Invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt,
|
|
|
923a60 |
i, journal_file_entry_array_n_items(o),
|
|
|
923a60 |
le64toh(o->entry_array.items[i]));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
@@ -335,14 +335,14 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
|
|
|
923a60 |
case OBJECT_TAG:
|
|
|
923a60 |
if (le64toh(o->object.size) != sizeof(TagObject)) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid object tag size: %"PRIu64,
|
|
|
923a60 |
+ "Invalid object tag size: %"PRIu64,
|
|
|
923a60 |
le64toh(o->object.size));
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!VALID_EPOCH(o->tag.epoch)) {
|
|
|
923a60 |
error(offset,
|
|
|
923a60 |
- "invalid object tag epoch: %"PRIu64,
|
|
|
923a60 |
+ "Invalid object tag epoch: %"PRIu64,
|
|
|
923a60 |
o->tag.epoch);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -415,8 +415,7 @@ static int entry_points_to_data(
|
|
|
923a60 |
assert(entry_fd >= 0);
|
|
|
923a60 |
|
|
|
923a60 |
if (!contains_uint64(f->mmap, entry_fd, n_entries, entry_p)) {
|
|
|
923a60 |
- error(data_p,
|
|
|
923a60 |
- "data object references invalid entry at "OFSfmt, entry_p);
|
|
|
923a60 |
+ error(data_p, "Data object references invalid entry at "OFSfmt, entry_p);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -432,8 +431,7 @@ static int entry_points_to_data(
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!found) {
|
|
|
923a60 |
- error(entry_p,
|
|
|
923a60 |
- "data object at "OFSfmt" not referenced by linked entry", data_p);
|
|
|
923a60 |
+ error(entry_p, "Data object at "OFSfmt" not referenced by linked entry", data_p);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -476,7 +474,7 @@ static int entry_points_to_data(
|
|
|
923a60 |
x = z;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
- error(entry_p, "entry object doesn't exist in main entry array");
|
|
|
923a60 |
+ error(entry_p, "Entry object doesn't exist in main entry array");
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -506,9 +504,7 @@ static int verify_data(
|
|
|
923a60 |
|
|
|
923a60 |
/* Entry array means at least two objects */
|
|
|
923a60 |
if (a && n < 2) {
|
|
|
923a60 |
- error(p,
|
|
|
923a60 |
- "entry array present (entry_array_offset="OFSfmt", but n_entries=%"PRIu64")",
|
|
|
923a60 |
- a, n);
|
|
|
923a60 |
+ error(p, "Entry array present (entry_array_offset="OFSfmt", but n_entries=%"PRIu64")", a, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -528,12 +524,12 @@ static int verify_data(
|
|
|
923a60 |
uint64_t next, m, j;
|
|
|
923a60 |
|
|
|
923a60 |
if (a == 0) {
|
|
|
923a60 |
- error(p, "array chain too short");
|
|
|
923a60 |
+ error(p, "Array chain too short");
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!contains_uint64(f->mmap, entry_array_fd, n_entry_arrays, a)) {
|
|
|
923a60 |
- error(p, "invalid array offset "OFSfmt, a);
|
|
|
923a60 |
+ error(p, "Invalid array offset "OFSfmt, a);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -543,8 +539,7 @@ static int verify_data(
|
|
|
923a60 |
|
|
|
923a60 |
next = le64toh(o->entry_array.next_entry_array_offset);
|
|
|
923a60 |
if (next != 0 && next <= a) {
|
|
|
923a60 |
- error(p, "array chain has cycle (jumps back from "OFSfmt" to "OFSfmt")",
|
|
|
923a60 |
- a, next);
|
|
|
923a60 |
+ error(p, "Array chain has cycle (jumps back from "OFSfmt" to "OFSfmt")", a, next);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -553,7 +548,7 @@ static int verify_data(
|
|
|
923a60 |
|
|
|
923a60 |
q = le64toh(o->entry_array.items[j]);
|
|
|
923a60 |
if (q <= last) {
|
|
|
923a60 |
- error(p, "data object's entry array not sorted");
|
|
|
923a60 |
+ error(p, "Data object's entry array not sorted");
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
last = q;
|
|
|
923a60 |
@@ -611,8 +606,7 @@ static int verify_hash_table(
|
|
|
923a60 |
uint64_t next;
|
|
|
923a60 |
|
|
|
923a60 |
if (!contains_uint64(f->mmap, data_fd, n_data, p)) {
|
|
|
923a60 |
- error(p, "invalid data object at hash entry %"PRIu64" of %"PRIu64,
|
|
|
923a60 |
- i, n);
|
|
|
923a60 |
+ error(p, "Invalid data object at hash entry %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -622,14 +616,12 @@ static int verify_hash_table(
|
|
|
923a60 |
|
|
|
923a60 |
next = le64toh(o->data.next_hash_offset);
|
|
|
923a60 |
if (next != 0 && next <= p) {
|
|
|
923a60 |
- error(p, "hash chain has a cycle in hash entry %"PRIu64" of %"PRIu64,
|
|
|
923a60 |
- i, n);
|
|
|
923a60 |
+ error(p, "Hash chain has a cycle in hash entry %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(o->data.hash) % n != i) {
|
|
|
923a60 |
- error(p, "hash value mismatch in hash entry %"PRIu64" of %"PRIu64,
|
|
|
923a60 |
- i, n);
|
|
|
923a60 |
+ error(p, "Hash value mismatch in hash entry %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -642,7 +634,7 @@ static int verify_hash_table(
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (last != le64toh(f->data_hash_table[i].tail_hash_offset)) {
|
|
|
923a60 |
- error(p, "tail hash pointer mismatch in hash table");
|
|
|
923a60 |
+ error(p, "Tail hash pointer mismatch in hash table");
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -703,16 +695,16 @@ static int verify_entry(
|
|
|
923a60 |
h = le64toh(o->entry.items[i].hash);
|
|
|
923a60 |
|
|
|
923a60 |
if (!contains_uint64(f->mmap, data_fd, n_data, q)) {
|
|
|
923a60 |
- error(p, "invalid data object of entry");
|
|
|
923a60 |
- return -EBADMSG;
|
|
|
923a60 |
- }
|
|
|
923a60 |
+ error(p, "Invalid data object of entry");
|
|
|
923a60 |
+ return -EBADMSG;
|
|
|
923a60 |
+ }
|
|
|
923a60 |
|
|
|
923a60 |
r = journal_file_move_to_object(f, OBJECT_DATA, q, &u);
|
|
|
923a60 |
if (r < 0)
|
|
|
923a60 |
return r;
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(u->data.hash) != h) {
|
|
|
923a60 |
- error(p, "hash mismatch for data object of entry");
|
|
|
923a60 |
+ error(p, "Hash mismatch for data object of entry");
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -720,7 +712,7 @@ static int verify_entry(
|
|
|
923a60 |
if (r < 0)
|
|
|
923a60 |
return r;
|
|
|
923a60 |
if (r == 0) {
|
|
|
923a60 |
- error(p, "data object missing from hash table");
|
|
|
923a60 |
+ error(p, "Data object missing from hash table");
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -755,12 +747,12 @@ static int verify_entry_array(
|
|
|
923a60 |
draw_progress(0x8000 + scale_progress(0x3FFF, i, n), last_usec);
|
|
|
923a60 |
|
|
|
923a60 |
if (a == 0) {
|
|
|
923a60 |
- error(a, "array chain too short at %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
+ error(a, "Array chain too short at %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!contains_uint64(f->mmap, entry_array_fd, n_entry_arrays, a)) {
|
|
|
923a60 |
- error(a, "invalid array %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
+ error(a, "Invalid array %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -770,9 +762,7 @@ static int verify_entry_array(
|
|
|
923a60 |
|
|
|
923a60 |
next = le64toh(o->entry_array.next_entry_array_offset);
|
|
|
923a60 |
if (next != 0 && next <= a) {
|
|
|
923a60 |
- error(a,
|
|
|
923a60 |
- "array chain has cycle at %"PRIu64" of %"PRIu64" (jumps back from to "OFSfmt")",
|
|
|
923a60 |
- i, n, next);
|
|
|
923a60 |
+ error(a, "Array chain has cycle at %"PRIu64" of %"PRIu64" (jumps back from to "OFSfmt")", i, n, next);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -782,15 +772,13 @@ static int verify_entry_array(
|
|
|
923a60 |
|
|
|
923a60 |
p = le64toh(o->entry_array.items[j]);
|
|
|
923a60 |
if (p <= last) {
|
|
|
923a60 |
- error(a, "entry array not sorted at %"PRIu64" of %"PRIu64,
|
|
|
923a60 |
- i, n);
|
|
|
923a60 |
+ error(a, "Entry array not sorted at %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
last = p;
|
|
|
923a60 |
|
|
|
923a60 |
if (!contains_uint64(f->mmap, entry_fd, n_entries, p)) {
|
|
|
923a60 |
- error(a, "invalid array entry at %"PRIu64" of %"PRIu64,
|
|
|
923a60 |
- i, n);
|
|
|
923a60 |
+ error(a, "Invalid array entry at %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
return -EBADMSG;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
@@ -878,7 +866,7 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
for (i = 0; i < sizeof(f->header->reserved); i++)
|
|
|
923a60 |
if (f->header->reserved[i] != 0) {
|
|
|
923a60 |
- error(offsetof(Header, reserved[i]), "reserved field is non-zero");
|
|
|
923a60 |
+ error(offsetof(Header, reserved[i]), "Reserved field is non-zero");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -897,12 +885,12 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o);
|
|
|
923a60 |
if (r < 0) {
|
|
|
923a60 |
- error(p, "invalid object");
|
|
|
923a60 |
+ error(p, "Invalid object");
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (p > le64toh(f->header->tail_object_offset)) {
|
|
|
923a60 |
- error(offsetof(Header, tail_object_offset), "invalid tail object pointer");
|
|
|
923a60 |
+ error(offsetof(Header, tail_object_offset), "Invalid tail object pointer");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -911,13 +899,13 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
r = journal_file_object_verify(f, p, o);
|
|
|
923a60 |
if (r < 0) {
|
|
|
923a60 |
- error(p, "invalid object contents: %s", strerror(-r));
|
|
|
923a60 |
+ error(p, "Envalid object contents: %s", strerror(-r));
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if ((o->object.flags & OBJECT_COMPRESSED_XZ) &&
|
|
|
923a60 |
(o->object.flags & OBJECT_COMPRESSED_LZ4)) {
|
|
|
923a60 |
- error(p, "objected with double compression");
|
|
|
923a60 |
+ error(p, "Objected with double compression");
|
|
|
923a60 |
r = -EINVAL;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -950,7 +938,7 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
case OBJECT_ENTRY:
|
|
|
923a60 |
if (JOURNAL_HEADER_SEALED(f->header) && n_tags <= 0) {
|
|
|
923a60 |
- error(p, "first entry before first tag");
|
|
|
923a60 |
+ error(p, "First entry before first tag");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -960,21 +948,21 @@ int journal_file_verify(
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(o->entry.realtime) < last_tag_realtime) {
|
|
|
923a60 |
- error(p, "older entry after newer tag");
|
|
|
923a60 |
+ error(p, "Older entry after newer tag");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!entry_seqnum_set &&
|
|
|
923a60 |
le64toh(o->entry.seqnum) != le64toh(f->header->head_entry_seqnum)) {
|
|
|
923a60 |
- error(p, "head entry sequence number incorrect");
|
|
|
923a60 |
+ error(p, "Head entry sequence number incorrect");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (entry_seqnum_set &&
|
|
|
923a60 |
entry_seqnum >= le64toh(o->entry.seqnum)) {
|
|
|
923a60 |
- error(p, "entry sequence number out of synchronization");
|
|
|
923a60 |
+ error(p, "Entry sequence number out of synchronization");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -985,7 +973,7 @@ int journal_file_verify(
|
|
|
923a60 |
if (entry_monotonic_set &&
|
|
|
923a60 |
sd_id128_equal(entry_boot_id, o->entry.boot_id) &&
|
|
|
923a60 |
entry_monotonic > le64toh(o->entry.monotonic)) {
|
|
|
923a60 |
- error(p, "entry timestamp out of synchronization");
|
|
|
923a60 |
+ error(p, "Entry timestamp out of synchronization");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -996,7 +984,7 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
if (!entry_realtime_set &&
|
|
|
923a60 |
le64toh(o->entry.realtime) != le64toh(f->header->head_entry_realtime)) {
|
|
|
923a60 |
- error(p, "head entry realtime timestamp incorrect");
|
|
|
923a60 |
+ error(p, "Head entry realtime timestamp incorrect");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -1009,7 +997,7 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
case OBJECT_DATA_HASH_TABLE:
|
|
|
923a60 |
if (n_data_hash_tables > 1) {
|
|
|
923a60 |
- error(p, "more than one data hash table");
|
|
|
923a60 |
+ error(p, "More than one data hash table");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -1026,14 +1014,14 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
case OBJECT_FIELD_HASH_TABLE:
|
|
|
923a60 |
if (n_field_hash_tables > 1) {
|
|
|
923a60 |
- error(p, "more than one field hash table");
|
|
|
923a60 |
+ error(p, "More than one field hash table");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(f->header->field_hash_table_offset) != p + offsetof(HashTableObject, items) ||
|
|
|
923a60 |
le64toh(f->header->field_hash_table_size) != le64toh(o->object.size) - offsetof(HashTableObject, items)) {
|
|
|
923a60 |
- error(p, "header fields for field hash table invalid");
|
|
|
923a60 |
+ error(p, "Header fields for field hash table invalid");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -1048,7 +1036,7 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
if (p == le64toh(f->header->entry_array_offset)) {
|
|
|
923a60 |
if (found_main_entry_array) {
|
|
|
923a60 |
- error(p, "more than one main entry array");
|
|
|
923a60 |
+ error(p, "More than one main entry array");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -1061,19 +1049,19 @@ int journal_file_verify(
|
|
|
923a60 |
|
|
|
923a60 |
case OBJECT_TAG:
|
|
|
923a60 |
if (!JOURNAL_HEADER_SEALED(f->header)) {
|
|
|
923a60 |
- error(p, "tag object in file without sealing");
|
|
|
923a60 |
+ error(p, "Tag object in file without sealing");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(o->tag.seqnum) != n_tags + 1) {
|
|
|
923a60 |
- error(p, "tag sequence number out of synchronization");
|
|
|
923a60 |
+ error(p, "Tag sequence number out of synchronization");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (le64toh(o->tag.epoch) < last_epoch) {
|
|
|
923a60 |
- error(p, "epoch sequence out of synchronization");
|
|
|
923a60 |
+ error(p, "Epoch sequence out of synchronization");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -1082,7 +1070,7 @@ int journal_file_verify(
|
|
|
923a60 |
if (f->seal) {
|
|
|
923a60 |
uint64_t q, rt;
|
|
|
923a60 |
|
|
|
923a60 |
- debug(p, "checking tag %"PRIu64"...", le64toh(o->tag.seqnum));
|
|
|
923a60 |
+ debug(p, "Checking tag %"PRIu64"...", le64toh(o->tag.seqnum));
|
|
|
923a60 |
|
|
|
923a60 |
rt = f->fss_start_usec + o->tag.epoch * f->fss_interval_usec;
|
|
|
923a60 |
if (entry_realtime_set && entry_realtime >= rt + f->fss_interval_usec) {
|
|
|
923a60 |
@@ -1129,7 +1117,7 @@ int journal_file_verify(
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
|
|
|
923a60 |
if (memcmp(o->tag.tag, gcry_md_read(f->hmac, 0), TAG_LENGTH) != 0) {
|
|
|
923a60 |
- error(p, "tag failed verification");
|
|
|
923a60 |
+ error(p, "Tag failed verification");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -1160,60 +1148,60 @@ int journal_file_verify(
|
|
|
923a60 |
};
|
|
|
923a60 |
|
|
|
923a60 |
if (!found_last && le64toh(f->header->tail_object_offset) != 0) {
|
|
|
923a60 |
- error(le64toh(f->header->tail_object_offset), "tail object pointer dead");
|
|
|
923a60 |
+ error(le64toh(f->header->tail_object_offset), "Tail object pointer dead");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (n_objects != le64toh(f->header->n_objects)) {
|
|
|
923a60 |
- error(offsetof(Header, n_objects), "object number mismatch");
|
|
|
923a60 |
+ error(offsetof(Header, n_objects), "Object number mismatch");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (n_entries != le64toh(f->header->n_entries)) {
|
|
|
923a60 |
- error(offsetof(Header, n_entries), "entry number mismatch");
|
|
|
923a60 |
+ error(offsetof(Header, n_entries), "Entry number mismatch");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (JOURNAL_HEADER_CONTAINS(f->header, n_data) &&
|
|
|
923a60 |
n_data != le64toh(f->header->n_data)) {
|
|
|
923a60 |
- error(offsetof(Header, n_data), "data number mismatch");
|
|
|
923a60 |
+ error(offsetof(Header, n_data), "Data number mismatch");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (JOURNAL_HEADER_CONTAINS(f->header, n_fields) &&
|
|
|
923a60 |
n_fields != le64toh(f->header->n_fields)) {
|
|
|
923a60 |
- error(offsetof(Header, n_fields), "field number mismatch");
|
|
|
923a60 |
+ error(offsetof(Header, n_fields), "Field number mismatch");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (JOURNAL_HEADER_CONTAINS(f->header, n_tags) &&
|
|
|
923a60 |
n_tags != le64toh(f->header->n_tags)) {
|
|
|
923a60 |
- error(offsetof(Header, n_tags), "tag number mismatch");
|
|
|
923a60 |
+ error(offsetof(Header, n_tags), "Tag number mismatch");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (JOURNAL_HEADER_CONTAINS(f->header, n_entry_arrays) &&
|
|
|
923a60 |
n_entry_arrays != le64toh(f->header->n_entry_arrays)) {
|
|
|
923a60 |
- error(offsetof(Header, n_entry_arrays), "entry array number mismatch");
|
|
|
923a60 |
+ error(offsetof(Header, n_entry_arrays), "Entry array number mismatch");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (!found_main_entry_array && le64toh(f->header->entry_array_offset) != 0) {
|
|
|
923a60 |
- error(0, "missing entry array");
|
|
|
923a60 |
+ error(0, "Missing entry array");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (entry_seqnum_set &&
|
|
|
923a60 |
entry_seqnum != le64toh(f->header->tail_entry_seqnum)) {
|
|
|
923a60 |
- error(offsetof(Header, tail_entry_seqnum), "invalid tail seqnum");
|
|
|
923a60 |
+ error(offsetof(Header, tail_entry_seqnum), "Invalid tail seqnum");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
@@ -1221,13 +1209,13 @@ int journal_file_verify(
|
|
|
923a60 |
if (entry_monotonic_set &&
|
|
|
923a60 |
(!sd_id128_equal(entry_boot_id, f->header->boot_id) ||
|
|
|
923a60 |
entry_monotonic != le64toh(f->header->tail_entry_monotonic))) {
|
|
|
923a60 |
- error(0, "invalid tail monotonic timestamp");
|
|
|
923a60 |
+ error(0, "Invalid tail monotonic timestamp");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
if (entry_realtime_set && entry_realtime != le64toh(f->header->tail_entry_realtime)) {
|
|
|
923a60 |
- error(0, "invalid tail realtime timestamp");
|
|
|
923a60 |
+ error(0, "Invalid tail realtime timestamp");
|
|
|
923a60 |
r = -EBADMSG;
|
|
|
923a60 |
goto fail;
|
|
|
923a60 |
}
|