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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50BABC6FA8E for ; Mon, 27 Feb 2023 02:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbjB0CQn (ORCPT ); Sun, 26 Feb 2023 21:16:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231221AbjB0COj (ORCPT ); Sun, 26 Feb 2023 21:14:39 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1B701ADCC; Sun, 26 Feb 2023 18:12:09 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0DF33B80D21; Mon, 27 Feb 2023 02:10:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 073A1C4339B; Mon, 27 Feb 2023 02:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677463825; bh=rjH8KSmDClsdXvuVsvL5uocACxmReGIxsYguJiYjQ4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJEjaBCC9pzZijNRkrb8aUOSG1Fal1nBiGRYMNkfdRQowQq8yeHoT7Cj9mdVuc+tF Kx8vs43qBD1h2y43Ev8hYuuCqlSnplIClQ+wbGXlVfYnw0eYxNy9hCiAgnzcdUWczw TLvZu833xGGhUEUezxsVAuOURF1XS2k5o1JltWMVSfaqV7J2Zs4c8NPbcx7m6J7U4T ivEpN9ZzZt2UrC1z0fCe+Ie69s7W1n29aOSZscIDeCtuHDrVal07Zvf44Na8fhrAnS 1Gz25pfpcjHWRlQJgpiGwOpRQEDIjbCLKQ2u1OnjB83TOJVoe6TFtsdN+Ih6QfTEAk bubInHyYsAhaw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Gruenbacher , Tetsuo Handa , syzbot+f51cb4b9afbd87ec06f2@syzkaller.appspotmail.com, Sasha Levin , rpeterso@redhat.com, cluster-devel@redhat.com Subject: [PATCH AUTOSEL 5.10 12/19] gfs2: Improve gfs2_make_fs_rw error handling Date: Sun, 26 Feb 2023 21:09:47 -0500 Message-Id: <20230227020957.1052252-12-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230227020957.1052252-1-sashal@kernel.org> References: <20230227020957.1052252-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andreas Gruenbacher [ Upstream commit b66f723bb552ad59c2acb5d45ea45c890f84498b ] In gfs2_make_fs_rw(), make sure to call gfs2_consist() to report an inconsistency and mark the filesystem as withdrawn when gfs2_find_jhead() fails. At the end of gfs2_make_fs_rw(), when we discover that the filesystem has been withdrawn, make sure we report an error. This also replaces the gfs2_withdrawn() check after gfs2_find_jhead(). Reported-by: Tetsuo Handa Cc: syzbot+f51cb4b9afbd87ec06f2@syzkaller.appspotmail.com Signed-off-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/super.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index d14b98aa1c3eb..5cb7e771b57ab 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -145,8 +145,10 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp) return -EIO; error = gfs2_find_jhead(sdp->sd_jdesc, &head, false); - if (error || gfs2_withdrawn(sdp)) + if (error) { + gfs2_consist(sdp); return error; + } if (!(head.lh_flags & GFS2_LOG_HEAD_UNMOUNT)) { gfs2_consist(sdp); @@ -158,7 +160,9 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp) gfs2_log_pointers_init(sdp, head.lh_blkno); error = gfs2_quota_init(sdp); - if (!error && !gfs2_withdrawn(sdp)) + if (!error && gfs2_withdrawn(sdp)) + error = -EIO; + if (!error) set_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags); return error; } -- 2.39.0