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 X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55F88C4727C for ; Tue, 29 Sep 2020 11:35:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1913D23BCB for ; Tue, 29 Sep 2020 11:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379318; bh=RsLRF8vLEU6ZXFXZGHE2tLISNmNjJZGFqf0VrK4rSrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=amoP4eKtpDyDRKBgi8VpMPEJpwNnVgpp7qUqvp29nT6XKa87LkFqT0CX2a+1h6aO7 21EVhVZFk9UTk5Hr1RecZw8kJ5juh/DpG9dGdbtn7f/+eC3YME4tn5D8SJ1Tx6pBOS fgNunAjax6nmaWuLXwRaIZyUaTa5jpbmd7tOXRAo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729819AbgI2LfQ (ORCPT ); Tue, 29 Sep 2020 07:35:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:49122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729553AbgI2LdZ (ORCPT ); Tue, 29 Sep 2020 07:33:25 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E26DE23B6B; Tue, 29 Sep 2020 11:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378778; bh=RsLRF8vLEU6ZXFXZGHE2tLISNmNjJZGFqf0VrK4rSrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QQLvaLaq/TS9zoBSZKX57hRuDoD2DgFLSvgpxFK71zIxyZHMeeYdiCZ2lB619cd3b m+4p5HMqgjGMfcTPnMJGMLMLPfPwgXfTIsBcQRghLNEpqn9+Id4A7qTqhaa5SA5zXv na0Xbq6BmS/NF1SZCUeXisA6DrnY13ce0+Cs0FEA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Darrick J. Wong" , Dave Chinner , Sasha Levin Subject: [PATCH 4.19 108/245] xfs: mark dir corrupt when lookup-by-hash fails Date: Tue, 29 Sep 2020 12:59:19 +0200 Message-Id: <20200929105952.244008724@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105946.978650816@linuxfoundation.org> References: <20200929105946.978650816@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Darrick J. Wong [ Upstream commit 2e107cf869eecc770e3f630060bb4e5f547d0fd8 ] In xchk_dir_actor, we attempt to validate the directory hash structures by performing a directory entry lookup by (hashed) name. If the lookup returns ENOENT, that means that the hash information is corrupt. The _process_error functions don't catch this, so we have to add that explicitly. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Sasha Levin --- fs/xfs/scrub/dir.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c index cd3e4d768a18c..33dfcba72c7a0 100644 --- a/fs/xfs/scrub/dir.c +++ b/fs/xfs/scrub/dir.c @@ -156,6 +156,9 @@ xchk_dir_actor( xname.type = XFS_DIR3_FT_UNKNOWN; error = xfs_dir_lookup(sdc->sc->tp, ip, &xname, &lookup_ino, NULL); + /* ENOENT means the hash lookup failed and the dir is corrupt */ + if (error == -ENOENT) + error = -EFSCORRUPTED; if (!xchk_fblock_process_error(sdc->sc, XFS_DATA_FORK, offset, &error)) goto out; -- 2.25.1