diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-02-28 01:58:45 +0100 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-02-28 20:08:27 +0100 |
| commit | 5d54ab154ca790688a6a1a2ad5f869c17a23980a (patch) | |
| tree | f127ca24ddb3071a8027a5219421d191381b28f6 | |
| parent | librbd: fix rollback size (diff) | |
| download | ceph-5d54ab154ca790688a6a1a2ad5f869c17a23980a.tar.xz ceph-5d54ab154ca790688a6a1a2ad5f869c17a23980a.zip | |
FileJournal::wrap_read_bl: adjust pos before returning
Otherwise, we may feed an offset past the end of the journal to
check_header in read_entry and incorrectly determine that the entry is
corrupt.
Fixes: 4296
Backport: bobtail
Backport: argonaut
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/os/FileJournal.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc index 50bbb95190e..0056f1f23b4 100644 --- a/src/os/FileJournal.cc +++ b/src/os/FileJournal.cc @@ -1591,6 +1591,8 @@ void FileJournal::wrap_read_bl(off64_t& pos, int64_t olen, bufferlist& bl) pos += len; olen -= len; } + if (pos >= header.max_size) + pos = pos + get_top() - header.max_size; } bool FileJournal::read_entry(bufferlist& bl, uint64_t& seq) |