From 50b4f72eb74c4ae8238731ac3ceb40b5a21b79b6 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 27 Feb 2013 16:58:45 -0800 Subject: 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 Signed-off-by: Samuel Just (cherry picked from commit 5d54ab154ca790688a6a1a2ad5f869c17a23980a) --- src/os/FileJournal.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc index 2a832d74da3..78227332e03 100644 --- a/src/os/FileJournal.cc +++ b/src/os/FileJournal.cc @@ -1586,6 +1586,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) -- cgit v1.2.1