Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fff3f7f authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: mark dir corrupt when lookup-by-hash fails 



[ 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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6ab959f1

fs/xfs/scrub/dir.c

+3 −0
Original line number Diff line number Diff line
@@ -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;