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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 80B33C43464 for ; Fri, 18 Sep 2020 03:04:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4347F206B7 for ; Fri, 18 Sep 2020 03:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600398265; bh=a3KtIY3zS5tFGMw/4re3J0MkdSRhsoocIYujeU5Ijgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DTKj9yjmal6bImzttGzvB02SKWxk2nPSpHtZWcOg5u9r7Wu7/jR/4nei+HwzDGMof 0rEg1/YFyTNLrD8KC/QUj8Za+pT1RObqy15BfRGpjGRi4vanlqAKQ9FHuWiZc+EeX8 LWRyl304z4Uu56ahrW3ZSkBXo60rihkXaLOze+oM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730590AbgIRDEY (ORCPT ); Thu, 17 Sep 2020 23:04:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:52458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726382AbgIRCEq (ORCPT ); Thu, 17 Sep 2020 22:04:46 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2EDFD23731; Fri, 18 Sep 2020 02:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394682; bh=a3KtIY3zS5tFGMw/4re3J0MkdSRhsoocIYujeU5Ijgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rSYmj3Rd09vzCtk6Y1ljYdeR93aknvKd7cuijxdq0G5zi7cmkn82yGEJG5VQraqmu pV9uStMslnO188s7iaulFw/TvtjYndjETYv9FKAMbgdN8BN0wsJnxEfsLa4Xpbi25h wyArt+A5YrexKNgxrkCFVvYx28wZW+ekz2LWPhGM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Dave Chinner , Sasha Levin , xfs@oss.sgi.com Subject: [PATCH AUTOSEL 5.4 172/330] xfs: mark dir corrupt when lookup-by-hash fails Date: Thu, 17 Sep 2020 21:58:32 -0400 Message-Id: <20200918020110.2063155-172-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 1e2e11721eb99..20eca2d8e7c77 100644 --- a/fs/xfs/scrub/dir.c +++ b/fs/xfs/scrub/dir.c @@ -152,6 +152,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