From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053046; b=FL8WKoDGyhtjgS1DXQr2wFCrth6kHNeVHYoHi3ACNYXyLsPBl47Y9Lxs52wo8gBe8R8J OGt4X+L8NzOjOjFDqA86e0pWMBsrJYp8TchlWhPVTVmQc+hvOdyBWSRhEn9eTi9ZnMrSQ 87ULSaZb2hWtfWJIzeXeFNEuvBSzw5kVCyddZlC7ctqxNzosTqz0WBfJDc84zkkXtSlYd +kjl2tGEA7kr+i93bgM60dcKM7XTVNv+N1xFw+nr1VSidV42o1IEnD5on2dMWyBXOh6FV q4+kIg08WkV+8D8Yrovst9HwmxFhqkjnG/SAMDRmgnyRzFoRs0zmuwRr7gLF7cOu+/Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053046; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=k0EuJhmVVR2t20ZOprlJzZvqIB6CJjqwYt02H0bmThM=; b=m9PLEtnXJgBzUn+XbND0foOXsVyTNZzbmpP9NRPwxCa/P48gwPT6/JiEZzyk7x9zYg3y HuvJ46lKRG/vRxCzLJho6BzsocTJa9YFfKP2zGF4FW4jS6zyg8czuKrnaXb2T9qtQnTzc myLZS3jkh4/9XWfCcP80Ebk9h3VPQT3CrpLO8zYn6vuiJ8tStvF0O2GHWjS+ZzxxCiMLj gsxskAubgvej8utLHyBJy+UZ/xMO5BXLO67xkIsvqaDi/OrtA3cxDxztcpIT87R58vHbB c/iFWGe1Lkf3qROANn6B6jSWPKcaiGc28/I7QP79fREymHjNI8ENeuCMznbeZ+UX/qA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=mqgGLtCc; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7185D606A31C; Thu, 19 Nov 2026 01:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=mqgGLtCc Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2A2E1F000C4; Thu, 19 Nov 2026 01:50:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053046; bh=k0EuJhmVVR2t20ZOprlJzZvqIB6CJjqwYt02H0bmThM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mqgGLtCcwDfZBAGl/qmcZnhYa5Q/CDG/SB2g8CJ39cF3mB8Wty3ytVMoARqUBo/M6 wgHOcAyzPNqiPlMxL5z/ada/fRNyS0mt3sXSoNnbcSmnDUzywUXzwM1OgvRJAUQyON ILLFTcdyury03p+eckFvRCUebKCBRE9E9WwXZsx8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Darrick J. Wong" , Christoph Hellwig , Carlos Maiolino , Sasha Levin Subject: [PATCH 5.15 0778/2214] xfs: improve dirent bounds checking in scrub and repair Date: Wed, 18 Nov 2026 15:40:54 +0100 Message-ID: <20261118150042.762684985@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Darrick J. Wong [ Upstream commit 5d470234d04dae6fe2ca2cf4b9ef277b78c7e05a ] LOLLM complains that we don't do enough bounds checking of the directory entries in directory blocks when we're looking for errors or trying to salvage entries. Let's improve that with more detailed checks. Cc: stable@vger.kernel.org # v4.16 Fixes: ce92d29ddf9908 ("xfs: directory scrubber must walk through data block to offset") Signed-off-by: Darrick J. Wong Assisted-by: LOLLM # finding obvious bugs Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino [ sashal: inlined checks in the existing xchk_dir_rec() loop because the upstream directory-walking helpers are absent ] Signed-off-by: Sasha Levin --- fs/xfs/scrub/dir.c | 61 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c index 200a63f58fe7c..7119eb0bb7d78 100644 --- a/fs/xfs/scrub/dir.c +++ b/fs/xfs/scrub/dir.c @@ -219,6 +219,7 @@ xchk_dir_rec( xfs_dahash_t hash; struct xfs_dir3_icleaf_hdr hdr; unsigned int tag; + bool foundit = false; int error; ASSERT(blk->magic == XFS_DIR2_LEAF1_MAGIC || @@ -263,28 +264,68 @@ xchk_dir_rec( dent = bp->b_addr + off; /* Make sure we got a real directory entry. */ - iter_off = geo->data_entry_offset; end = xfs_dir3_data_end_offset(geo, bp->b_addr); if (!end) { xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); goto out_relse; } - for (;;) { + iter_off = geo->data_entry_offset; + while (iter_off < end) { struct xfs_dir2_data_entry *dep = bp->b_addr + iter_off; struct xfs_dir2_data_unused *dup = bp->b_addr + iter_off; + unsigned int advance; - if (iter_off >= end) { + /* must have freetag */ + advance = offsetof(typeof(*dup), length); + if (iter_off + advance >= end) { xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); goto out_relse; } if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG) { - iter_off += be16_to_cpu(dup->length); + if (iter_off + sizeof(*dup) > end) { + xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, + rec_bno); + goto out_relse; + } + + advance = round_up(be16_to_cpu(dup->length), + XFS_DIR2_DATA_ALIGN); + if (!advance || iter_off + advance > end) { + xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, + rec_bno); + goto out_relse; + } + + iter_off += advance; continue; } - if (dep == dent) + + /* must have namelen */ + advance = offsetof(typeof(*dep), name); + if (iter_off + advance >= end) { + xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); + goto out_relse; + } + + /* Don't walk off the end of the block. */ + advance = xfs_dir2_data_entsize(mp, dep->namelen); + if (!advance || iter_off + advance > end) { + xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); + goto out_relse; + } + + if (dep == dent) { + foundit = true; break; - iter_off += xfs_dir2_data_entsize(mp, dep->namelen); + } + iter_off += advance; + } + + /* Hash tree must point to the exact dirent */ + if (!foundit) { + xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); + goto out_relse; } /* Retrieve the entry, sanity check it, and compare hashes. */ @@ -297,6 +338,14 @@ xchk_dir_rec( xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); goto out_relse; } + + /* Name must not overflow end of block */ + if ((char *)dent->name + dent->namelen > + (char *)bp->b_addr + BBTOB(bp->b_length)) { + xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); + goto out_relse; + } + calc_hash = xfs_da_hashname(dent->name, dent->namelen); if (calc_hash != hash) xchk_fblock_set_corrupt(ds->sc, XFS_DATA_FORK, rec_bno); -- 2.53.0