Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp5658593rwl; Sun, 8 Jan 2023 20:05:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXunI28IvaDhO7A1lGbk8hiKWc1kpVQA1XBPdblzkyCTJiGWbta/WwC3DBn0R4TrhZHLyCfn X-Received: by 2002:a05:6402:5293:b0:494:eb9:54c4 with SMTP id en19-20020a056402529300b004940eb954c4mr11476025edb.19.1673237113682; Sun, 08 Jan 2023 20:05:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673237113; cv=none; d=google.com; s=arc-20160816; b=XlLtPRa1lSEnAHAsj/EhoJWp4M5G4GNJWUrE7Yz4EyjqqQPUweGsbNSorPsicYy1Jv WcO5WfYPateIOSAeRy3dPA7/wlyWAsiJwkboMrO1MYD4XP60qX0OLOamWxJ1JmnvkMwl foTA+uA/jtLF63Yqyqfgn3GsRte6O1UT+qpji1hqKgC3G5pu4NEWa/rMUTP9DX1/SQaT KV57JtfK3GPzO9OuFrC3T4nBfF+ikvcnI2S6UUq+Ha/B8V0agsM6Aejcr0h39xPhPWX2 SzUCMvovXBVoqkGnkS17ZEUdc1Mc69fktybYHedGBWJJNubvDitUomAQ9Y/HXn7YYhF2 UiEg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=EWbsLOrxWTFiqQfMeqCVPDHd30PUivdO48Wj9KerfHs=; b=sKqIdYeAJ08RUjpqakGthf7Zlkh/gDwlPDgQeGlGGgC619B85S+tcBFQiS8Oy2RtQH KTQF0ST9DzN9Pn7zOmmxD+JDQAnvkc+nHlyUYGhU+O/8a+2SSi1hzn//uUeYBghGEYdX nX+YpIhQulr8HCWg/xs9VFFib8rOgTl0VjZvuLZlN8gSf8aNAPS2OUKrYfxqJYlKNZC9 RC7A+UFCWxKiO5vDUY+X77vN4CdOD6DHIHoZeP7j8MgDGQFOhg2ijcH7rQsu39cA2N98 AiIT6PWDGx6f0+/FeRi/+vKSf44MgAqGoravftXKkF3rhNcqU/GgkKONqhz2n5gJNMls 7Gxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QF0kQZFG; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q26-20020a50cc9a000000b0046b3638938bsi7355884edi.536.2023.01.08.20.04.59; Sun, 08 Jan 2023 20:05:13 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=QF0kQZFG; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233695AbjAIDtg (ORCPT + 52 others); Sun, 8 Jan 2023 22:49:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234198AbjAIDtc (ORCPT ); Sun, 8 Jan 2023 22:49:32 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20870F014 for ; Sun, 8 Jan 2023 19:49:32 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id BCDB3B80C7B for ; Mon, 9 Jan 2023 03:49:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48A10C433EF; Mon, 9 Jan 2023 03:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673236169; bh=XDnCVXGXzYassBSR7qHkIyje/nQ1gYWjET1uSxSAlPU=; h=From:To:Cc:Subject:Date:From; b=QF0kQZFGD4IGR1HiSBf3nfIBQguOfRQngtDixAdlAUnAV+BatyEQTKxsIS3Kfd/z0 R6+IGFXydUKl+pYhhvbB6Dyl+gjsI1dxSENzXEOUcadIpYC6+0zev16t5ePdY6Es63 RegS/rIqusgco2qRB673yEyKjNwgvUCvJwPdu2EtL5IH4fWzSBwKBr56JWfkI5r6Yl gk6SUmKiZ9H6rA814DjgEYIVLqgWG7deCvyk7IRKtbng+7QvDK2mragDgAaWMM7RHe qhxqhg7T+CAPpCDaNSAAb1HLl88jXrgqMGHL+7POu9Gzt7479aJnRggNVwEjNmDQQn jB+eB64wvQVVw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] f2fs: fix to do sanity check on extent cache correctly Date: Mon, 9 Jan 2023 11:49:20 +0800 Message-Id: <20230109034920.492914-1-chao@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 In do_read_inode(), sanity_check_inode() should be called after f2fs_init_read_extent_tree(), fix it. Fixes: 72840cccc0a1 ("f2fs: allocate the extent_cache by default") Signed-off-by: Chao Yu --- fs/f2fs/inode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index de5cd311ca79..574dee5d44e0 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -413,12 +413,6 @@ static int do_read_inode(struct inode *inode) fi->i_inline_xattr_size = 0; } - if (!sanity_check_inode(inode, node_page)) { - f2fs_put_page(node_page, 1); - f2fs_handle_error(sbi, ERROR_CORRUPTED_INODE); - return -EFSCORRUPTED; - } - /* check data exist */ if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode)) __recover_inline_status(inode, node_page); @@ -482,6 +476,12 @@ static int do_read_inode(struct inode *inode) f2fs_init_read_extent_tree(inode, node_page); f2fs_init_age_extent_tree(inode); + if (!sanity_check_inode(inode, node_page)) { + f2fs_put_page(node_page, 1); + f2fs_handle_error(sbi, ERROR_CORRUPTED_INODE); + return -EFSCORRUPTED; + } + f2fs_put_page(node_page, 1); stat_inc_inline_xattr(inode); -- 2.25.1