system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 20:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: Handle partially read HashItem's when punching holes

Browse source
This commit is contained in:
Daan De Meyer 2021-12-20 14:55:02 +01:00 committed by Yu Watanabe
parent 8ef114c692
commit 94c5a83c6e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/journal/journald-file.c
View file

@ -81,7 +81,7 @@ static int journald_file_entry_array_punch_hole(JournalFile *f, uint64_t p, uint
static int journald_file_punch_holes(JournalFile *f) {
HashItem items[PAYLOAD_BUFFER_SIZE / sizeof(HashItem)];
uint64_t p, sz;
ssize_t n;
ssize_t n = SSIZE_MAX;
int r;
r = journald_file_entry_array_punch_hole(
@ -92,11 +92,14 @@ static int journald_file_punch_holes(JournalFile *f) {
p = le64toh(f->header->data_hash_table_offset);
sz = le64toh(f->header->data_hash_table_size);
for (uint64_t i = p; i < p + sz; i += n) {
for (uint64_t i = p; i < p + sz && n > 0; i += n) {
n = pread(f->fd, items, MIN(sizeof(items), p + sz - i), i);
if (n < 0)
return n;
/* Let's ignore any partial hash items by rounding down to the nearest multiple of HashItem. */
n -= n % sizeof(HashItem);
for (size_t j = 0; j < (size_t) n / sizeof(HashItem); j++) {
Object o;