]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0
authorAbhi Das <adas@redhat.com>
Tue, 4 Feb 2020 20:14:56 +0000 (14:14 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Feb 2020 12:37:04 +0000 (04:37 -0800)
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 <adas@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/gfs2/lops.c

index aa0359b7e2aca0266ccb0391c237e561b0a5b5d2..b5cf507190066a77123ea3ab36e16bb30efbd9db 100644 (file)
@@ -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;