summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/journal/journal-verify.c416
1 files changed, 215 insertions, 201 deletions
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 5a0751f2aa..333757b5b5 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -34,6 +34,73 @@
#include "compress.h"
#include "fsprg.h"
+static void draw_progress(uint64_t p, usec_t *last_usec) {
+ unsigned n, i, j, k;
+ usec_t z, x;
+
+ if (!on_tty())
+ return;
+
+ z = now(CLOCK_MONOTONIC);
+ x = *last_usec;
+
+ if (x != 0 && x + 40 * USEC_PER_MSEC > z)
+ return;
+
+ *last_usec = z;
+
+ n = (3 * columns()) / 4;
+ j = (n * (unsigned) p) / 65535ULL;
+ k = n - j;
+
+ fputs("\r\x1B[?25l" ANSI_HIGHLIGHT_GREEN_ON, stdout);
+
+ for (i = 0; i < j; i++)
+ fputs("\xe2\x96\x88", stdout);
+
+ fputs(ANSI_HIGHLIGHT_OFF, stdout);
+
+ for (i = 0; i < k; i++)
+ fputs("\xe2\x96\x91", stdout);
+
+ printf(" %3"PRIu64"%%", 100U * p / 65535U);
+
+ fputs("\r\x1B[?25h", stdout);
+ fflush(stdout);
+}
+
+static void flush_progress(void) {
+ unsigned n, i;
+
+ if (!on_tty())
+ return;
+
+ n = (3 * columns()) / 4;
+
+ putchar('\r');
+
+ for (i = 0; i < n + 5; i++)
+ putchar(' ');
+
+ putchar('\r');
+ fflush(stdout);
+}
+
+#define debug(_offset, _fmt, ...) do{ \
+ flush_progress(); \
+ log_debug(OFSfmt": " _fmt, _offset, ##__VA_ARGS__); \
+ } while(0)
+
+#define warning(_offset, _fmt, ...) do{ \
+ flush_progress(); \
+ log_warning(OFSfmt": " _fmt, _offset, ##__VA_ARGS__); \
+ } while(0)
+
+#define error(_offset, _fmt, ...) do{ \
+ flush_progress(); \
+ log_error(OFSfmt": " _fmt, (uint64_t)_offset, ##__VA_ARGS__); \
+ } while(0)
+
static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o) {
uint64_t i;
@@ -56,18 +123,17 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
int compression, r;
if (le64toh(o->data.entry_offset) == 0)
- log_warning(OFSfmt": unused data (entry_offset==0)", offset);
+ warning(offset, "unused data (entry_offset==0)");
if ((le64toh(o->data.entry_offset) == 0) ^ (le64toh(o->data.n_entries) == 0)) {
- log_error(OFSfmt": bad n_entries: %"PRIu64, offset, o->data.n_entries);
+ error(offset, "bad n_entries: %"PRIu64, o->data.n_entries);
return -EBADMSG;
}
if (le64toh(o->object.size) - offsetof(DataObject, payload) <= 0) {
- log_error(OFSfmt": bad object size (<= %zu): %"PRIu64,
- offset,
- offsetof(DataObject, payload),
- le64toh(o->object.size));
+ error(offset, "bad object size (<= %zu): %"PRIu64,
+ offsetof(DataObject, payload),
+ le64toh(o->object.size));
return -EBADMSG;
}
@@ -83,8 +149,8 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
le64toh(o->object.size) - offsetof(Object, data.payload),
&b, &alloc, &b_size, 0);
if (r < 0) {
- log_error(OFSfmt": %s decompression failed: %s", offset,
- object_compressed_to_string(compression), strerror(-r));
+ error(offset, "%s decompression failed: %s",
+ object_compressed_to_string(compression), strerror(-r));
return r;
}
@@ -93,7 +159,7 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
if (h1 != h2) {
- log_error(OFSfmt": invalid hash (%08"PRIx64" vs. %08"PRIx64, offset, h1, h2);
+ error(offset, "invalid hash (%08"PRIx64" vs. %08"PRIx64, h1, h2);
return -EBADMSG;
}
@@ -101,12 +167,11 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
!VALID64(o->data.next_field_offset) ||
!VALID64(o->data.entry_offset) ||
!VALID64(o->data.entry_array_offset)) {
- log_error(OFSfmt": invalid offset (next_hash_offset="OFSfmt", next_field_offset="OFSfmt", entry_offset="OFSfmt", entry_array_offset="OFSfmt,
- offset,
- o->data.next_hash_offset,
- o->data.next_field_offset,
- o->data.entry_offset,
- o->data.entry_array_offset);
+ error(offset, "invalid offset (next_hash_offset="OFSfmt", next_field_offset="OFSfmt", entry_offset="OFSfmt", entry_array_offset="OFSfmt,
+ o->data.next_hash_offset,
+ o->data.next_field_offset,
+ o->data.entry_offset,
+ o->data.entry_array_offset);
return -EBADMSG;
}
@@ -115,67 +180,67 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
case OBJECT_FIELD:
if (le64toh(o->object.size) - offsetof(FieldObject, payload) <= 0) {
- log_error(OFSfmt": bad field size (<= %zu): %"PRIu64,
- offset,
- offsetof(FieldObject, payload),
- le64toh(o->object.size));
+ error(offset,
+ "bad field size (<= %zu): %"PRIu64,
+ offsetof(FieldObject, payload),
+ le64toh(o->object.size));
return -EBADMSG;
}
if (!VALID64(o->field.next_hash_offset) ||
!VALID64(o->field.head_data_offset)) {
- log_error(OFSfmt": invalid offset (next_hash_offset="OFSfmt", head_data_offset="OFSfmt,
- offset,
- o->field.next_hash_offset,
- o->field.head_data_offset);
+ error(offset,
+ "invalid offset (next_hash_offset="OFSfmt", head_data_offset="OFSfmt,
+ o->field.next_hash_offset,
+ o->field.head_data_offset);
return -EBADMSG;
}
break;
case OBJECT_ENTRY:
if ((le64toh(o->object.size) - offsetof(EntryObject, items)) % sizeof(EntryItem) != 0) {
- log_error(OFSfmt": bad entry size (<= %zu): %"PRIu64,
- offset,
- offsetof(EntryObject, items),
- le64toh(o->object.size));
+ error(offset,
+ "bad entry size (<= %zu): %"PRIu64,
+ offsetof(EntryObject, items),
+ le64toh(o->object.size));
return -EBADMSG;
}
if ((le64toh(o->object.size) - offsetof(EntryObject, items)) / sizeof(EntryItem) <= 0) {
- log_error(OFSfmt": invalid number items in entry: %"PRIu64,
- offset,
- (le64toh(o->object.size) - offsetof(EntryObject, items)) / sizeof(EntryItem));
+ error(offset,
+ "invalid number items in entry: %"PRIu64,
+ (le64toh(o->object.size) - offsetof(EntryObject, items)) / sizeof(EntryItem));
return -EBADMSG;
}
if (le64toh(o->entry.seqnum) <= 0) {
- log_error(OFSfmt": invalid entry seqnum: %"PRIx64,
- offset,
- le64toh(o->entry.seqnum));
+ error(offset,
+ "invalid entry seqnum: %"PRIx64,
+ le64toh(o->entry.seqnum));
return -EBADMSG;
}
if (!VALID_REALTIME(le64toh(o->entry.realtime))) {
- log_error(OFSfmt": invalid entry realtime timestamp: %"PRIu64,
- offset,
- le64toh(o->entry.realtime));
+ error(offset,
+ "invalid entry realtime timestamp: %"PRIu64,
+ le64toh(o->entry.realtime));
return -EBADMSG;
}
if (!VALID_MONOTONIC(le64toh(o->entry.monotonic))) {
- log_error(OFSfmt": invalid entry monotonic timestamp: %"PRIu64,
- offset,
- le64toh(o->entry.monotonic));
+ error(offset,
+ "invalid entry monotonic timestamp: %"PRIu64,
+ le64toh(o->entry.monotonic));
return -EBADMSG;
}
for (i = 0; i < journal_file_entry_n_items(o); i++) {
if (o->entry.items[i].object_offset == 0 ||
!VALID64(o->entry.items[i].object_offset)) {
- log_error(OFSfmt": invalid entry item (%"PRIu64"/%"PRIu64" offset: "OFSfmt,
- offset,
- i, journal_file_entry_n_items(o),
- o->entry.items[i].object_offset);
+ error(offset,
+ "invalid entry item (%"PRIu64"/%"PRIu64" offset: "OFSfmt,
+ i, journal_file_entry_n_items(o),
+ o->entry.items[i].object_offset);
return -EBADMSG;
}
}
@@ -186,41 +251,41 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
case OBJECT_FIELD_HASH_TABLE:
if ((le64toh(o->object.size) - offsetof(HashTableObject, items)) % sizeof(HashItem) != 0 ||
(le64toh(o->object.size) - offsetof(HashTableObject, items)) / sizeof(HashItem) <= 0) {
- log_error(OFSfmt": invalid %s hash table size: %"PRIu64,
- offset,
- o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
- le64toh(o->object.size));
+ error(offset,
+ "invalid %s hash table size: %"PRIu64,
+ o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
+ le64toh(o->object.size));
return -EBADMSG;
}
for (i = 0; i < journal_file_hash_table_n_items(o); i++) {
if (o->hash_table.items[i].head_hash_offset != 0 &&
!VALID64(le64toh(o->hash_table.items[i].head_hash_offset))) {
- log_error(OFSfmt": invalid %s hash table item (%"PRIu64"/%"PRIu64") head_hash_offset: "OFSfmt,
- offset,
- o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
- i, journal_file_hash_table_n_items(o),
- le64toh(o->hash_table.items[i].head_hash_offset));
+ error(offset,
+ "invalid %s hash table item (%"PRIu64"/%"PRIu64") head_hash_offset: "OFSfmt,
+ o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
+ i, journal_file_hash_table_n_items(o),
+ le64toh(o->hash_table.items[i].head_hash_offset));
return -EBADMSG;
}
if (o->hash_table.items[i].tail_hash_offset != 0 &&
!VALID64(le64toh(o->hash_table.items[i].tail_hash_offset))) {
- log_error(OFSfmt": invalid %s hash table item (%"PRIu64"/%"PRIu64") tail_hash_offset: "OFSfmt,
- offset,
- o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
- i, journal_file_hash_table_n_items(o),
- le64toh(o->hash_table.items[i].tail_hash_offset));
+ error(offset,
+ "invalid %s hash table item (%"PRIu64"/%"PRIu64") tail_hash_offset: "OFSfmt,
+ o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
+ i, journal_file_hash_table_n_items(o),
+ le64toh(o->hash_table.items[i].tail_hash_offset));
return -EBADMSG;
}
if ((o->hash_table.items[i].head_hash_offset != 0) !=
(o->hash_table.items[i].tail_hash_offset != 0)) {
- log_error(OFSfmt": invalid %s hash table item (%"PRIu64"/%"PRIu64"): head_hash_offset="OFSfmt" tail_hash_offset="OFSfmt,
- offset,
- o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
- i, journal_file_hash_table_n_items(o),
- le64toh(o->hash_table.items[i].head_hash_offset),
- le64toh(o->hash_table.items[i].tail_hash_offset));
+ error(offset,
+ "invalid %s hash table item (%"PRIu64"/%"PRIu64"): head_hash_offset="OFSfmt" tail_hash_offset="OFSfmt,
+ o->object.type == OBJECT_DATA_HASH_TABLE ? "data" : "field",
+ i, journal_file_hash_table_n_items(o),
+ le64toh(o->hash_table.items[i].head_hash_offset),
+ le64toh(o->hash_table.items[i].tail_hash_offset));
return -EBADMSG;
}
}
@@ -230,26 +295,26 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
case OBJECT_ENTRY_ARRAY:
if ((le64toh(o->object.size) - offsetof(EntryArrayObject, items)) % sizeof(le64_t) != 0 ||
(le64toh(o->object.size) - offsetof(EntryArrayObject, items)) / sizeof(le64_t) <= 0) {
- log_error(OFSfmt": invalid object entry array size: %"PRIu64,
- offset,
- le64toh(o->object.size));
+ error(offset,
+ "invalid object entry array size: %"PRIu64,
+ le64toh(o->object.size));
return -EBADMSG;
}
if (!VALID64(o->entry_array.next_entry_array_offset)) {
- log_error(OFSfmt": invalid object entry array next_entry_array_offset: "OFSfmt,
- offset,
- o->entry_array.next_entry_array_offset);
+ error(offset,
+ "invalid object entry array next_entry_array_offset: "OFSfmt,
+ o->entry_array.next_entry_array_offset);
return -EBADMSG;
}
for (i = 0; i < journal_file_entry_array_n_items(o); i++)
if (le64toh(o->entry_array.items[i]) != 0 &&
!VALID64(le64toh(o->entry_array.items[i]))) {
- log_error(OFSfmt": invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt,
- offset,
- i, journal_file_entry_array_n_items(o),
- le64toh(o->entry_array.items[i]));
+ error(offset,
+ "invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt,
+ i, journal_file_entry_array_n_items(o),
+ le64toh(o->entry_array.items[i]));
return -EBADMSG;
}
@@ -257,16 +322,16 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
case OBJECT_TAG:
if (le64toh(o->object.size) != sizeof(TagObject)) {
- log_error(OFSfmt": invalid object tag size: %"PRIu64,
- offset,
- le64toh(o->object.size));
+ error(offset,
+ "invalid object tag size: %"PRIu64,
+ le64toh(o->object.size));
return -EBADMSG;
}
if (!VALID_EPOCH(o->tag.epoch)) {
- log_error(OFSfmt": invalid object tag epoch: %"PRIu64,
- offset,
- o->tag.epoch);
+ error(offset,
+ "invalid object tag epoch: %"PRIu64,
+ o->tag.epoch);
return -EBADMSG;
}
@@ -276,58 +341,6 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
return 0;
}
-static void draw_progress(uint64_t p, usec_t *last_usec) {
- unsigned n, i, j, k;
- usec_t z, x;
-
- if (!on_tty())
- return;
-
- z = now(CLOCK_MONOTONIC);
- x = *last_usec;
-
- if (x != 0 && x + 40 * USEC_PER_MSEC > z)
- return;
-
- *last_usec = z;
-
- n = (3 * columns()) / 4;
- j = (n * (unsigned) p) / 65535ULL;
- k = n - j;
-
- fputs("\r\x1B[?25l" ANSI_HIGHLIGHT_GREEN_ON, stdout);
-
- for (i = 0; i < j; i++)
- fputs("\xe2\x96\x88", stdout);
-
- fputs(ANSI_HIGHLIGHT_OFF, stdout);
-
- for (i = 0; i < k; i++)
- fputs("\xe2\x96\x91", stdout);
-
- printf(" %3"PRIu64"%%", 100U * p / 65535U);
-
- fputs("\r\x1B[?25h", stdout);
- fflush(stdout);
-}
-
-static void flush_progress(void) {
- unsigned n, i;
-
- if (!on_tty())
- return;
-
- n = (3 * columns()) / 4;
-
- putchar('\r');
-
- for (i = 0; i < n + 5; i++)
- putchar(' ');
-
- putchar('\r');
- fflush(stdout);
-}
-
static int write_uint64(int fd, uint64_t p) {
ssize_t k;
@@ -390,7 +403,8 @@ static int entry_points_to_data(
assert(entry_fd >= 0);
if (!contains_uint64(f->mmap, entry_fd, n_entries, entry_p)) {
- log_error("Data object references invalid entry at %"PRIu64, data_p);
+ error(data_p,
+ "data object references invalid entry at "OFSfmt, entry_p);
return -EBADMSG;
}
@@ -406,7 +420,8 @@ static int entry_points_to_data(
}
if (!found) {
- log_error("Data object not referenced by linked entry at %"PRIu64, data_p);
+ error(entry_p,
+ "data object at "OFSfmt" not referenced by linked entry", data_p);
return -EBADMSG;
}
@@ -449,7 +464,7 @@ static int entry_points_to_data(
x = z;
}
- log_error("Entry object doesn't exist in main entry array at %"PRIu64, entry_p);
+ error(entry_p, "entry object doesn't exist in main entry array");
return -EBADMSG;
}
@@ -479,8 +494,9 @@ static int verify_data(
/* Entry array means at least two objects */
if (a && n < 2) {
- log_error("Entry array present (entry_array_offset=%"PRIu64", but n_entries=%"PRIu64,
- a, n);
+ error(p,
+ "entry array present (entry_array_offset="OFSfmt", but n_entries=%"PRIu64")",
+ a, n);
return -EBADMSG;
}
@@ -500,12 +516,12 @@ static int verify_data(
uint64_t next, m, j;
if (a == 0) {
- log_error("Array chain too short at %"PRIu64, p);
+ error(p, "array chain too short");
return -EBADMSG;
}
if (!contains_uint64(f->mmap, entry_array_fd, n_entry_arrays, a)) {
- log_error("Invalid array at %"PRIu64, p);
+ error(p, "invalid array offset "OFSfmt, a);
return -EBADMSG;
}
@@ -515,7 +531,8 @@ 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 %"PRIu64, p);
+ error(p, "array chain has cycle (jumps back from "OFSfmt" to "OFSfmt")",
+ a, next);
return -EBADMSG;
}
@@ -524,7 +541,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 %"PRIu64, p);
+ error(p, "data object's entry array not sorted");
return -EBADMSG;
}
last = q;
@@ -575,8 +592,8 @@ 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 %"PRIu64" of %"PRIu64,
- i, n);
+ error(p, "invalid data object at hash entry %"PRIu64" of %"PRIu64,
+ i, n);
return -EBADMSG;
}
@@ -586,14 +603,14 @@ 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 %"PRIu64" of %"PRIu64,
- i, n);
+ error(p, "hash chain has a cycle in hash entry %"PRIu64" of %"PRIu64,
+ i, n);
return -EBADMSG;
}
if (le64toh(o->data.hash) % n != i) {
- log_error("Hash value mismatch in hash entry %"PRIu64" of %"PRIu64,
- i, n);
+ error(p, "hash value mismatch in hash entry %"PRIu64" of %"PRIu64,
+ i, n);
return -EBADMSG;
}
@@ -606,7 +623,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");
+ error(p, "tail hash pointer mismatch in hash table");
return -EBADMSG;
}
}
@@ -660,7 +677,7 @@ 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 %"PRIu64, p);
+ error(p, "invalid data object of entry");
return -EBADMSG;
}
@@ -669,7 +686,7 @@ static int verify_entry(
return r;
if (le64toh(u->data.hash) != h) {
- log_error("Hash mismatch for data object at entry %"PRIu64, p);
+ error(p, "hash mismatch for data object of entry");
return -EBADMSG;
}
@@ -677,7 +694,7 @@ static int verify_entry(
if (r < 0)
return r;
if (r == 0) {
- log_error("Data object missing from hash at entry %"PRIu64, p);
+ error(p, "data object missing from hash table");
return -EBADMSG;
}
}
@@ -712,12 +729,12 @@ static int verify_entry_array(
draw_progress(0x8000 + (0x3FFF * i / n), last_usec);
if (a == 0) {
- log_error("Array chain too short at %"PRIu64" of %"PRIu64, i, n);
+ error(a, "array chain too short at %"PRIu64" of %"PRIu64, i, n);
return -EBADMSG;
}
if (!contains_uint64(f->mmap, entry_array_fd, n_entry_arrays, a)) {
- log_error("Invalid array at %"PRIu64" of %"PRIu64, i, n);
+ error(a, "invalid array %"PRIu64" of %"PRIu64, i, n);
return -EBADMSG;
}
@@ -727,7 +744,9 @@ 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 %"PRIu64" of %"PRIu64, i, n);
+ error(a,
+ "array chain has cycle at %"PRIu64" of %"PRIu64" (jumps back from to "OFSfmt")",
+ i, n, next);
return -EBADMSG;
}
@@ -737,15 +756,15 @@ static int verify_entry_array(
p = le64toh(o->entry_array.items[j]);
if (p <= last) {
- log_error("Entry array not sorted at %"PRIu64" of %"PRIu64,
- i, n);
+ error(a, "entry array not sorted at %"PRIu64" of %"PRIu64,
+ i, n);
return -EBADMSG;
}
last = p;
if (!contains_uint64(f->mmap, entry_fd, n_entries, p)) {
- log_error("Invalid array entry at %"PRIu64" of %"PRIu64,
- i, n);
+ error(a, "invalid array entry at %"PRIu64" of %"PRIu64,
+ i, n);
return -EBADMSG;
}
@@ -825,12 +844,7 @@ int journal_file_verify(
goto fail;
}
-#ifdef HAVE_GCRYPT
- if ((le32toh(f->header->compatible_flags) & ~HEADER_COMPATIBLE_SEALED) != 0)
-#else
- if (f->header->compatible_flags != 0)
-#endif
- {
+ if (le32toh(f->header->compatible_flags) & ~HEADER_COMPATIBLE_SUPPORTED) {
log_error("Cannot verify file with unknown extensions.");
r = -ENOTSUP;
goto fail;
@@ -838,7 +852,7 @@ int journal_file_verify(
for (i = 0; i < sizeof(f->header->reserved); i++)
if (f->header->reserved[i] != 0) {
- log_error("Reserved field in non-zero.");
+ error(offsetof(Header, reserved[i]), "reserved field is non-zero");
r = -EBADMSG;
goto fail;
}
@@ -853,12 +867,12 @@ int journal_file_verify(
r = journal_file_move_to_object(f, -1, p, &o);
if (r < 0) {
- log_error("Invalid object at "OFSfmt, p);
+ error(p, "invalid object");
goto fail;
}
if (p > le64toh(f->header->tail_object_offset)) {
- log_error("Invalid tail object pointer");
+ error(offsetof(Header, tail_object_offset), "invalid tail object pointer");
r = -EBADMSG;
goto fail;
}
@@ -870,25 +884,25 @@ int journal_file_verify(
r = journal_file_object_verify(f, p, o);
if (r < 0) {
- log_error("Invalid object contents at "OFSfmt": %s", p, strerror(-r));
+ error(p, "invalid object contents: %s", strerror(-r));
goto fail;
}
if ((o->object.flags & OBJECT_COMPRESSED_XZ) &&
(o->object.flags & OBJECT_COMPRESSED_LZ4)) {
- log_error("Objected with double compression at "OFSfmt, p);
- r = -EBADMSG;
+ error(p, "objected with double compression");
+ r = -EINVAL;
goto fail;
}
if ((o->object.flags & OBJECT_COMPRESSED_XZ) && !JOURNAL_HEADER_COMPRESSED_XZ(f->header)) {
- log_error("XZ compressed object in file without XZ compression at "OFSfmt, p);
+ error(p, "XZ compressed object in file without XZ compression");
r = -EBADMSG;
goto fail;
}
if ((o->object.flags & OBJECT_COMPRESSED_LZ4) && !JOURNAL_HEADER_COMPRESSED_LZ4(f->header)) {
- log_error("LZ4 compressed object in file without LZ4 compression at "OFSfmt, p);
+ error(p, "LZ4 compressed object in file without LZ4 compression");
r = -EBADMSG;
goto fail;
}
@@ -909,7 +923,7 @@ int journal_file_verify(
case OBJECT_ENTRY:
if (JOURNAL_HEADER_SEALED(f->header) && n_tags <= 0) {
- log_error("First entry before first tag at "OFSfmt, p);
+ error(p, "first entry before first tag");
r = -EBADMSG;
goto fail;
}
@@ -919,21 +933,21 @@ int journal_file_verify(
goto fail;
if (le64toh(o->entry.realtime) < last_tag_realtime) {
- log_error("Older entry after newer tag at "OFSfmt, p);
+ error(p, "older entry after newer tag");
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 at "OFSfmt, p);
+ error(p, "head entry sequence number incorrect");
r = -EBADMSG;
goto fail;
}
if (entry_seqnum_set &&
entry_seqnum >= le64toh(o->entry.seqnum)) {
- log_error("Entry sequence number out of synchronization at "OFSfmt, p);
+ error(p, "entry sequence number out of synchronization");
r = -EBADMSG;
goto fail;
}
@@ -944,7 +958,7 @@ int journal_file_verify(
if (entry_monotonic_set &&
sd_id128_equal(entry_boot_id, o->entry.boot_id) &&
entry_monotonic > le64toh(o->entry.monotonic)) {
- log_error("Entry timestamp out of synchronization at "OFSfmt, p);
+ error(p, "entry timestamp out of synchronization");
r = -EBADMSG;
goto fail;
}
@@ -955,7 +969,7 @@ int journal_file_verify(
if (!entry_realtime_set &&
le64toh(o->entry.realtime) != le64toh(f->header->head_entry_realtime)) {
- log_error("Head entry realtime timestamp incorrect");
+ error(p, "head entry realtime timestamp incorrect");
r = -EBADMSG;
goto fail;
}
@@ -968,14 +982,14 @@ int journal_file_verify(
case OBJECT_DATA_HASH_TABLE:
if (n_data_hash_tables > 1) {
- log_error("More than one data hash table at "OFSfmt, p);
+ error(p, "more than one data hash table");
r = -EBADMSG;
goto fail;
}
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");
+ error(p, "header fields for data hash table invalid");
r = -EBADMSG;
goto fail;
}
@@ -985,14 +999,14 @@ int journal_file_verify(
case OBJECT_FIELD_HASH_TABLE:
if (n_field_hash_tables > 1) {
- log_error("More than one field hash table at "OFSfmt, p);
+ error(p, "more than one field hash table");
r = -EBADMSG;
goto fail;
}
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");
+ error(p, "header fields for field hash table invalid");
r = -EBADMSG;
goto fail;
}
@@ -1007,7 +1021,7 @@ int journal_file_verify(
if (p == le64toh(f->header->entry_array_offset)) {
if (found_main_entry_array) {
- log_error("More than one main entry array at "OFSfmt, p);
+ error(p, "more than one main entry array");
r = -EBADMSG;
goto fail;
}
@@ -1020,19 +1034,19 @@ int journal_file_verify(
case OBJECT_TAG:
if (!JOURNAL_HEADER_SEALED(f->header)) {
- log_error("Tag object in file without sealing at "OFSfmt, p);
+ error(p, "tag object in file without sealing");
r = -EBADMSG;
goto fail;
}
if (le64toh(o->tag.seqnum) != n_tags + 1) {
- log_error("Tag sequence number out of synchronization at "OFSfmt, p);
+ error(p, "tag sequence number out of synchronization");
r = -EBADMSG;
goto fail;
}
if (le64toh(o->tag.epoch) < last_epoch) {
- log_error("Epoch sequence out of synchronization at "OFSfmt, p);
+ error(p, "epoch sequence out of synchronization");
r = -EBADMSG;
goto fail;
}
@@ -1041,11 +1055,11 @@ int journal_file_verify(
if (f->seal) {
uint64_t q, rt;
- log_debug("Checking tag %"PRIu64"...", le64toh(o->tag.seqnum));
+ debug(p, "checking tag %"PRIu64"...", le64toh(o->tag.seqnum));
rt = f->fss_start_usec + o->tag.epoch * f->fss_interval_usec;
if (entry_realtime_set && entry_realtime >= rt + f->fss_interval_usec) {
- log_error("Tag/entry realtime timestamp out of synchronization at "OFSfmt, p);
+ error(p, "tag/entry realtime timestamp out of synchronization");
r = -EBADMSG;
goto fail;
}
@@ -1088,7 +1102,7 @@ int journal_file_verify(
goto fail;
if (memcmp(o->tag.tag, gcry_md_read(f->hmac, 0), TAG_LENGTH) != 0) {
- log_error("Tag failed verification at "OFSfmt, p);
+ error(p, "tag failed verification");
r = -EBADMSG;
goto fail;
}
@@ -1117,72 +1131,72 @@ int journal_file_verify(
}
if (!found_last) {
- log_error("Tail object pointer dead");
+ error(le64toh(f->header->tail_object_offset), "tail object pointer dead");
r = -EBADMSG;
goto fail;
}
if (n_objects != le64toh(f->header->n_objects)) {
- log_error("Object number mismatch");
+ error(offsetof(Header, n_objects), "object number mismatch");
r = -EBADMSG;
goto fail;
}
if (n_entries != le64toh(f->header->n_entries)) {
- log_error("Entry number mismatch");
+ error(offsetof(Header, n_entries), "entry number mismatch");
r = -EBADMSG;
goto fail;
}
if (JOURNAL_HEADER_CONTAINS(f->header, n_data) &&
n_data != le64toh(f->header->n_data)) {
- log_error("Data number mismatch");
+ error(offsetof(Header, n_data), "data number mismatch");
r = -EBADMSG;
goto fail;
}
if (JOURNAL_HEADER_CONTAINS(f->header, n_fields) &&
n_fields != le64toh(f->header->n_fields)) {
- log_error("Field number mismatch");
+ error(offsetof(Header, n_fields), "field number mismatch");
r = -EBADMSG;
goto fail;
}
if (JOURNAL_HEADER_CONTAINS(f->header, n_tags) &&
n_tags != le64toh(f->header->n_tags)) {
- log_error("Tag number mismatch");
+ error(offsetof(Header, n_tags), "tag number mismatch");
r = -EBADMSG;
goto fail;
}
if (JOURNAL_HEADER_CONTAINS(f->header, n_entry_arrays) &&
n_entry_arrays != le64toh(f->header->n_entry_arrays)) {
- log_error("Entry array number mismatch");
+ error(offsetof(Header, n_entry_arrays), "entry array number mismatch");
r = -EBADMSG;
goto fail;
}
if (n_data_hash_tables != 1) {
- log_error("Missing data hash table");
+ error(0, "missing data hash table");
r = -EBADMSG;
goto fail;
}
if (n_field_hash_tables != 1) {
- log_error("Missing field hash table");
+ error(0, "missing field hash table");
r = -EBADMSG;
goto fail;
}
if (!found_main_entry_array) {
- log_error("Missing entry array");
+ error(0, "missing entry array");
r = -EBADMSG;
goto fail;
}
if (entry_seqnum_set &&
entry_seqnum != le64toh(f->header->tail_entry_seqnum)) {
- log_error("Invalid tail seqnum");
+ error(offsetof(Header, tail_entry_seqnum), "invalid tail seqnum");
r = -EBADMSG;
goto fail;
}
@@ -1190,13 +1204,13 @@ int journal_file_verify(
if (entry_monotonic_set &&
(!sd_id128_equal(entry_boot_id, f->header->boot_id) ||
entry_monotonic != le64toh(f->header->tail_entry_monotonic))) {
- log_error("Invalid tail monotonic timestamp");
+ error(0, "invalid tail monotonic timestamp");
r = -EBADMSG;
goto fail;
}
if (entry_realtime_set && entry_realtime != le64toh(f->header->tail_entry_realtime)) {
- log_error("Invalid tail realtime timestamp");
+ error(0, "invalid tail realtime timestamp");
r = -EBADMSG;
goto fail;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-25 02:41:05 +0000