From patchwork Tue Sep 29 10:59:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 290844 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=unavailable 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 5B202C47423 for ; Tue, 29 Sep 2020 12:24:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EEBD2076A for ; Tue, 29 Sep 2020 12:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601382288; bh=RsLRF8vLEU6ZXFXZGHE2tLISNmNjJZGFqf0VrK4rSrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j9cK7XNU2pVMC5p96BBvdDTGlDYy4ryOcO7oGNKIq6vidzdrg2DrO7KZi2M4vvxad FOtyx9vP6PrY2si6F76FPioeeUDoDcu7tQoT4GT8OI/f3hJILpChXSxfgpZ8BCGNPZ Z/ZOIERKwUVv/mxKKgBy4SADib/iERlCgN0ptSgA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728875AbgI2LfG (ORCPT ); Tue, 29 Sep 2020 07:35:06 -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 Precedence: bulk List-ID: X-Mailing-List: stable@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;