From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58356C352A3 for ; Mon, 10 Feb 2020 12:58:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FC7620714 for ; Mon, 10 Feb 2020 12:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581339524; bh=FwxRVwrf3HtPEl8NyRFM30eRNOqp7VploIS1YQCsNBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZG6GOmBw16wsjsBumUc3LMp1u+svXT9+imDjA2SDrY6RBVSkRGzilrDtG03B3bD+h /F1B/8D1oARoymcS+eoq8NOfvwjp4L6F+CFBl39B+uuBv7t8AQsbvVG1k+6tIFnUe7 IQVkshwMWTx9PFn5R4iMZuWn36SGxu0NRShrG8YM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730043AbgBJM6k (ORCPT ); Mon, 10 Feb 2020 07:58:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:43130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729174AbgBJMlR (ORCPT ); Mon, 10 Feb 2020 07:41:17 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 673312080C; Mon, 10 Feb 2020 12:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338477; bh=FwxRVwrf3HtPEl8NyRFM30eRNOqp7VploIS1YQCsNBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UBzUzKdhffdpKWiX8aylm9BrUoiwO/lhp4nz2K+o5rgshrmRN+BEPX4cgzgPbqu4y daYAA2NK0tofkwsq+YBxn5z72DpIVzHx7s623wv+WbOtSIzUPYPkAFGQdN9ZSjt/Od My0y2Fc+mVa0wLvCVyw9NqyFcO7MtNv8WNPHG3dg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Abhi Das , Andreas Gruenbacher Subject: [PATCH 5.5 209/367] gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0 Date: Mon, 10 Feb 2020 04:32:02 -0800 Message-Id: <20200210122443.669979204@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Abhi Das 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 --- fs/gfs2/lops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c @@ -422,7 +422,7 @@ static bool gfs2_jhead_pg_srch(struct gf 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;