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 CAA75C4332F for ; Wed, 12 Oct 2022 01:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229459AbiJLBvn (ORCPT ); Tue, 11 Oct 2022 21:51:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbiJLBvl (ORCPT ); Tue, 11 Oct 2022 21:51:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4087AA3F40 for ; Tue, 11 Oct 2022 18:51:41 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id CAF3E61342 for ; Wed, 12 Oct 2022 01:51:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23440C433D7; Wed, 12 Oct 2022 01:51:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1665539500; bh=PusVSPaFUEFNzUQzCe9r61ecWZDRzUiH/+90HvU/iio=; h=Date:To:From:Subject:From; b=dPtxAj6nZJ7Rpy+Zt3Nimcm71LezDevhs2GG6n6IxJc/72ToGe5UAewtw0DHg77BK Ssz/1GiOf/QdzZF6Ld0PIAKzClCPmRzFyF96UY9z6GS5/MkHOHzBCSxa5lUcyMM6oG r/rc4W6XbrxGDw3wliVAK/UJuscQRtmfmXQMhBW4= Date: Tue, 11 Oct 2022 18:51:39 -0700 To: mm-commits@vger.kernel.org, konishi.ryusuke@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] nilfs2-replace-warn_ons-by-nilfs_error-for-checkpoint-acquisition-failure.patch removed from -mm tree Message-Id: <20221012015140.23440C433D7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure has been removed from the -mm tree. Its filename was nilfs2-replace-warn_ons-by-nilfs_error-for-checkpoint-acquisition-failure.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Ryusuke Konishi Subject: nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure Date: Thu, 29 Sep 2022 21:33:30 +0900 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 Reported-by: syzbot+fbb3e0b24e8dae5a16ee@syzkaller.appspotmail.com Signed-off-by: Andrew Morton --- fs/nilfs2/segment.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) --- a/fs/nilfs2/segment.c~nilfs2-replace-warn_ons-by-nilfs_error-for-checkpoint-acquisition-failure +++ a/fs/nilfs2/segment.c @@ -875,9 +875,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; } @@ -891,7 +893,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; _ Patches currently in -mm which might be from konishi.ryusuke@gmail.com are nilfs2-fix-use-after-free-bug-of-struct-nilfs_root.patch nilfs2-fix-null-pointer-dereference-at-nilfs_bmap_lookup_at_level.patch nilfs2-fix-leak-of-nilfs_root-in-case-of-writer-thread-creation-failure.patch