diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-28 19:33:23 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-01-11 10:07:22 -0500 |
| commit | ae97089d49d1795a35a443b7b830ee666028e733 (patch) | |
| tree | 528eab7122f5a7b4bb0cf1ad220164b3c0438323 /src/journal/journal-verify.c | |
| parent | 47917e4a4a8f1ee00bb7de3e83f7bfd849abf337 (diff) | |
journal: fix access to munmapped memory in sd_journal_enumerate_unique
sd_j_e_u needs to keep a reference to an object while comparing it
with possibly duplicate objects in other files. Because the size of
mmap cache is limited, with enough files and object to compare to,
at some point the object being compared would be munmapped, resulting
in a segmentation fault.
Fix this issue by turning keep_always into a reference count that can
be increased and decreased. Other callers which set keep_always=true
are unmodified: their references are never released but are ignored
when the whole file is closed, which happens at some point. keep_always
is increased in sd_j_e_u and later on released.
Diffstat (limited to 'src/journal/journal-verify.c')
| -rw-r--r-- | src/journal/journal-verify.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c index 82b0f0a98b..f2422ff841 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -34,10 +34,6 @@ #include "compress.h" #include "fsprg.h" -/* Use six characters to cover the offsets common in smallish journal - * files without adding to many zeros. */ -#define OFSfmt "%06"PRIx64 - static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o) { uint64_t i; |