lkml.org 
[lkml]   [2022]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 04/54] nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure
    Date
    From: Ryusuke Konishi <konishi.ryusuke@gmail.com>

    commit 723ac751208f6d6540191689cfbf6c77135a7a1b upstream.

    If creation or finalization of a checkpoint fails due to anomalies in the
    checkpoint metadata on disk, a kernel warning is generated.

    This patch replaces the WARN_ONs by nilfs_error, so that a kernel, booted
    with panic_on_warn, does not panic. A nilfs_error is appropriate here to
    handle the abnormal filesystem condition.

    This also replaces the detected error codes with an I/O error so that
    neither of the internal error codes is returned to callers.

    Link: https://lkml.kernel.org/r/20220929123330.19658-1-konishi.ryusuke@gmail.com
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
    Reported-by: syzbot+fbb3e0b24e8dae5a16ee@syzkaller.appspotmail.com
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/nilfs2/segment.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/fs/nilfs2/segment.c
    +++ b/fs/nilfs2/segment.c
    @@ -880,9 +880,11 @@ static int nilfs_segctor_create_checkpoi
    nilfs_mdt_mark_dirty(nilfs->ns_cpfile);
    nilfs_cpfile_put_checkpoint(
    nilfs->ns_cpfile, nilfs->ns_cno, bh_cp);
    - } else
    - WARN_ON(err == -EINVAL || err == -ENOENT);
    -
    + } else if (err == -EINVAL || err == -ENOENT) {
    + nilfs_error(sci->sc_super,
    + "checkpoint creation failed due to metadata corruption.");
    + err = -EIO;
    + }
    return err;
    }

    @@ -896,7 +898,11 @@ static int nilfs_segctor_fill_in_checkpo
    err = nilfs_cpfile_get_checkpoint(nilfs->ns_cpfile, nilfs->ns_cno, 0,
    &raw_cp, &bh_cp);
    if (unlikely(err)) {
    - WARN_ON(err == -EINVAL || err == -ENOENT);
    + if (err == -EINVAL || err == -ENOENT) {
    + nilfs_error(sci->sc_super,
    + "checkpoint finalization failed due to metadata corruption.");
    + err = -EIO;
    + }
    goto failed_ibh;
    }
    raw_cp->cp_snapshot_list.ssl_next = 0;

    \
     
     \ /
      Last update: 2022-10-13 19:58    [W:4.207 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site