From: Abhi Das Date: Tue, 4 Feb 2020 20:14:56 +0000 (-0600) Subject: gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0 X-Git-Tag: v5.5.3~160 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=87c6124ed2095e72456bc151c01a16c3262ef23b;p=users%2Fdwmw2%2Flinux.git gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0 commit 7582026f6f3588ecebd281965c8a71aff6fb6158 upstream. 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 Signed-off-by: Andreas Gruenbacher Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index aa0359b7e2aca..b5cf507190066 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;