SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journald: detect invalid header pointers correctly

Browse Source
This commit is contained in:
Lennart Poettering
2012-09-10 11:58:00 +02:00
parent 9d576438a1
commit 7762e02b17
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journal-file.c
+13 -4
View File
@@ -221,10 +221,16 @@ static int journal_file_verify_header(JournalFile *f) {
if (le64toh(f->header->tail_object_offset) > (le64toh(f->header->header_size) + le64toh(f->header->arena_size)))
return -ENODATA;
if (!VALID64(f->header->data_hash_table_offset) ||
!VALID64(f->header->field_hash_table_offset) ||
!VALID64(f->header->tail_object_offset) ||
!VALID64(f->header->entry_array_offset))
if (!VALID64(le64toh(f->header->data_hash_table_offset)) ||
!VALID64(le64toh(f->header->field_hash_table_offset)) ||
!VALID64(le64toh(f->header->tail_object_offset)) ||
!VALID64(le64toh(f->header->entry_array_offset)))
return -ENODATA;
if (le64toh(f->header->data_hash_table_offset) < le64toh(f->header->header_size) ||
le64toh(f->header->field_hash_table_offset) < le64toh(f->header->header_size) ||
le64toh(f->header->tail_object_offset) < le64toh(f->header->header_size) ||
le64toh(f->header->entry_array_offset) < le64toh(f->header->header_size))
return -ENODATA;
if (f->writable) {
@@ -323,6 +329,9 @@ static int journal_file_move_to(JournalFile *f, int context, bool keep_always, u
assert(f);
assert(ret);
if (size <= 0)
return -EINVAL;
/* Avoid SIGBUS on invalid accesses */
if (offset + size > (uint64_t) f->last_stat.st_size) {
/* Hmm, out of range? Let's refresh the fstat() data