From patchwork Thu Oct 13 17:51:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp405345wrs; Thu, 13 Oct 2022 10:57:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7oM5IKQXHU7Qjvne+/3VHJLfC0AWTEOMKuVgabx0DXbV+jVBJDwBz8wdG8CLPWSjihV1ez X-Received: by 2002:a05:6402:320e:b0:45c:ae50:dbca with SMTP id g14-20020a056402320e00b0045cae50dbcamr869795eda.104.1665683850792; Thu, 13 Oct 2022 10:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683850; cv=none; d=google.com; s=arc-20160816; b=nkSPjY5dGVxb3niM7ICZ/pcXVqJldnyR9DO78Fep+M5kKn4ugAnZwTDYyNIWpZzSCq QwOYf8sg2/Er2ovDO++72kbqXEQPM8DgnEG74lf/w/wbshi24chO4xON+c30uHg+gAr6 PFVfcfRuptgPea3NaKaWolx0Mphw6ga6RNcp7lQWoqrKwQKP/A36IZBVPpj9XBxzgiSz 6t0V2qF+IFk08LlhGJ20SNRcor60hhR5nApAf9s3+q8QmJz0GhBODdPtVEkcIS8rJ+S8 6jkH/yjW1oc32prNYFvdTzoh4E3wEbzX5KBdag4wmGT19ztUp0MC9MYQY3HcUciZZO4c /QXQ== 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=kSkOSNfZFT7Qfmz2zilc5ELgLBIkqCQTebf1ovSKwEA=; b=PjXGVdWL96vM2i4dICE2A3W+gkQks3s4vR9tqZnb73u14tu4xPoBlAtRhHiyd5RR84 0FFXIAwZH6JuJl0/XSp9HtJKCPp0QCaRG1z4/VgsgnXuh6+uOAr1HMxoaaIJa5XDjDL8 jn/ksEykwAFutyHHmWxjPL9RRfQApOJ8Cckl7TGhPqHQQOaGN6/8Qyx5velrFfjAt1hR gEtH27pxFmtOucmoJUYeVNUy/pIj6ADLQLGlYyPHs4dMM8plVQjRXtx61naj5jMgkDJT 6gKoqYn7frHEyKVN23GmjJcERbs3uNCm6TSNDS3jwGPJ/mhMLkpyRdQr/mmgkML7OQuZ rx6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Md7M5vva; 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 m4-20020a1709062b8400b0078d4b605b71si236732ejg.338.2022.10.13.10.57.06; Thu, 13 Oct 2022 10:57:30 -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=Md7M5vva; 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 S229542AbiJMR4w (ORCPT + 99 others); Thu, 13 Oct 2022 13:56:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbiJMR4R (ORCPT ); Thu, 13 Oct 2022 13:56:17 -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 8ADCC2A402; Thu, 13 Oct 2022 10:54:55 -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 BB67B6190B; Thu, 13 Oct 2022 17:54:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9AE5C433D6; Thu, 13 Oct 2022 17:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683687; bh=5/+T7+Hbc+gs+Q2MxLjLyv7qCijM55C8bgamH/I/2XQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Md7M5vvau8g8ef02YRhnk2+UWUXp7p1akHDZWf87Em8ZcnqmGJG8wtgguf5vNbwf0 PfVSiQdmL7aQ+JFG/3N9GHJtCaL8AbK1lEGvtPqXYdK/u0gaK1NckgojfKoiXMrcVs BuduFhebvoeOddanW50G6TS7d+IoPZsiAXd60Hxs= 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 5.10 04/54] nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure Date: Thu, 13 Oct 2022 19:51:58 +0200 Message-Id: <20221013175147.454389715@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@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?1746596110010378249?= X-GMAIL-MSGID: =?utf-8?q?1746596110010378249?= 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 @@ -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;