summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAbhi Das <adas@redhat.com>2020-02-04 14:14:56 -0600
committerAndreas Gruenbacher <agruenba@redhat.com>2020-02-06 17:35:23 +0100
commit7582026f6f3588ecebd281965c8a71aff6fb6158 (patch)
treebbff92297065efcbdfd7795b8a28a0f54ceb4c14 /fs
parenta62aa6f7f50a9a0af5e07d98774f8a7b439d390f (diff)
downloadlwn-7582026f6f3588ecebd281965c8a71aff6fb6158.tar.gz
lwn-7582026f6f3588ecebd281965c8a71aff6fb6158.zip
gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0
When the first log header in a journal happens to have a sequence number of 0, a bug in gfs2_find_jhead() causes it to prematurely exit, and return an uninitialized jhead with seq 0. This can cause failures in the caller. For instance, a mount fails in one test case. The correct behavior is for it to continue searching through the journal to find the correct journal head with the highest sequence number. Fixes: f4686c26ecc3 ("gfs2: read journal in large chunks") Cc: stable@vger.kernel.org # v5.2+ Signed-off-by: Abhi Das <adas@redhat.com> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/lops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index d9431724b788..c090d5ad3f22 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -422,7 +422,7 @@ static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd,
for (offset = 0; offset < PAGE_SIZE; offset += sdp->sd_sb.sb_bsize) {
if (!__get_log_header(sdp, kaddr + offset, 0, &lh)) {
- if (lh.lh_sequence > head->lh_sequence)
+ if (lh.lh_sequence >= head->lh_sequence)
*head = lh;
else {
ret = true;