From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>,
Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
syzbot+f51cb4b9afbd87ec06f2@syzkaller.appspotmail.com,
Sasha Levin <sashal@kernel.org>,
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 [thread overview]
Message-ID: <20230227020957.1052252-12-sashal@kernel.org> (raw)
In-Reply-To: <20230227020957.1052252-1-sashal@kernel.org>
From: Andreas Gruenbacher <agruenba@redhat.com>
[ 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 <penguin-kernel@i-love.sakura.ne.jp>
Cc: syzbot+f51cb4b9afbd87ec06f2@syzkaller.appspotmail.com
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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
next prev parent reply other threads:[~2023-02-27 2:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 2:09 [PATCH AUTOSEL 5.10 01/19] drm/amd/display: Fix potential null-deref in dm_resume Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 02/19] drm/omap: dsi: Fix excessive stack usage Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 03/19] HID: Add Mapping for System Microphone Mute Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 04/19] drm/tiny: ili9486: Do not assume 8-bit only SPI controllers Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 05/19] drm/radeon: free iio for atombios when driver shutdown Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 06/19] drm: amd: display: Fix memory leakage Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 07/19] drm/msm/dsi: Add missing check for alloc_ordered_workqueue Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 08/19] docs/scripts/gdb: add necessary make scripts_gdb step Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 09/19] ASoC: kirkwood: Iterate over array indexes instead of using pointer math Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 10/19] regulator: max77802: Bounds check regulator id against opmode Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 11/19] regulator: s5m8767: Bounds check id indexing into arrays Sasha Levin
2023-02-27 2:09 ` Sasha Levin [this message]
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 13/19] hwmon: (coretemp) Simplify platform device handling Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 14/19] pinctrl: at91: use devm_kasprintf() to avoid potential leaks Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 15/19] HID: logitech-hidpp: Don't restart communication if not necessary Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 16/19] drm: panel-orientation-quirks: Add quirk for Lenovo IdeaPad Duet 3 10IGL5 Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 17/19] dm thin: add cond_resched() to various workqueue loops Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 18/19] dm cache: " Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 19/19] nfsd: zero out pointers after putting nfsd_files on COPY setup error Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230227020957.1052252-12-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=agruenba@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=rpeterso@redhat.com \
--cc=stable@vger.kernel.org \
--cc=syzbot+f51cb4b9afbd87ec06f2@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®