lkml.org 
[lkml]   [2023]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.2 40/60] gfs2: Improve gfs2_make_fs_rw error handling
    Date
    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 999cc146d7083..a07cf31f58ec3 100644
    --- a/fs/gfs2/super.c
    +++ b/fs/gfs2/super.c
    @@ -138,8 +138,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);
    @@ -151,7 +153,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
    \
     
     \ /
      Last update: 2023-03-27 00:36    [W:5.714 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site