From patchwork Thu Oct 13 17:52:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp412682wrs; Thu, 13 Oct 2022 11:11:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5bDf/aWTKlgWnyseLbTM1GPGyfoRh2ynK64RZEA/jXOeKbfPpFlFU3QLbrJ/5Sotgg/Rj2 X-Received: by 2002:a17:90b:4b02:b0:20d:3937:7ad with SMTP id lx2-20020a17090b4b0200b0020d393707admr12543098pjb.145.1665684680829; Thu, 13 Oct 2022 11:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684680; cv=none; d=google.com; s=arc-20160816; b=jipzUQpHcSP0IBDe/b0v5DadGGLfFl3XwrwcB2G+lulDKnwR7k14G9guQj9NbKYOjx 86ZjxiUZD98EAYvQocYEVy5iC8g6kDLwO+VEIoGeNel4x00uHJdy0ch258I0R45VQJTU MXx50+Ow6Sanp4QjsElnudF50oFYMw2bBx0T+ayaWNkr9Iq3VuKx5N/gnGx+pFufSGdZ zIdW+wb2Pu9xlkaseIB8/ruxug6Nlgl4jPiUJVkilxajgY8FOL8mUbOHnR1fb0AhuXko aiP4CIGWBsmc0BcsQ7P9LzTWVHRM3K68XopvbpEe/7axF/BGqyBrWSlO8eYLf5WmgVE0 Qs/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aNgRi6K6QlKRGK4Ipwa6FfNJWusnQAp2ZBui43ru6fM=; b=LXgcKfbbLeyKwXUkBQQUiaPhooxrsfbCxg39Cc5UvDpUhA3D/EmMH3WUll562Ae0or RnlgZmSgiooqgEM2oL1Tp3B9VUv6rhzgH024Xfw52YhXiEWVr3qWHqsr1WVjF42oIF/Z 2Y2oZggWpn1d86/JQfDbZ+RgWukH9pnfTNtrmZoS2nX8FZNeMCSIl6DMVQWfpULGMnV9 5aHTqqdO+8CH2JvmQhzsD6/c6VEmx0sr5JZ+3dnidm6CPFYJzqlxjt8BVkkdDjh3IQXJ X0Wq0x4DwS4P0hlXmRJf9vlMyoyzAHxlV6WK35bfoqjYFDnOFt/DvQPO6rbI/bk5j6lm SROg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=olOTxqoR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v8-20020a056a00148800b0056391cc1e6asi12245190pfu.354.2022.10.13.11.11.08; Thu, 13 Oct 2022 11:11:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=olOTxqoR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231469AbiJMSKz (ORCPT + 99 others); Thu, 13 Oct 2022 14:10:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231476AbiJMSKM (ORCPT ); Thu, 13 Oct 2022 14:10:12 -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 ECBAC9DDBC; Thu, 13 Oct 2022 11:07:39 -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 3B22661A33; Thu, 13 Oct 2022 18:01:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44103C433D6; Thu, 13 Oct 2022 18:01:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665684118; bh=T5hUlJubGs9iN1Cr22GehC2ffTzgTKc0wkupXsH0j3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=olOTxqoRN6lLR20A+z7lFF36e9GdfYYhtgF1xCiJfSPZffOBI6mwZyErODhUbIizR JqfYOstJ1r9au824fbwDqrLvCkoQr7ehC8SEAOd/zYBedhfQrmJQ3OMsVH5P9IwAtF 5c6QuO4s1dT0578S4GWMjeb/qySdFnIyM19Icme4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ryusuke Konishi , syzbot+fbb3e0b24e8dae5a16ee@syzkaller.appspotmail.com, Andrew Morton Subject: [PATCH 6.0 04/34] nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure Date: Thu, 13 Oct 2022 19:52:42 +0200 Message-Id: <20221013175146.634269087@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175146.507746257@linuxfoundation.org> References: <20221013175146.507746257@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596980059397307?= X-GMAIL-MSGID: =?utf-8?q?1746596980059397307?= From: Ryusuke Konishi 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 Reported-by: syzbot+fbb3e0b24e8dae5a16ee@syzkaller.appspotmail.com Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/nilfs2/segment.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) --- a/fs/nilfs2/segment.c +++ b/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;