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=1794407250; b=f6T09NdCytv+wDaP6GDI8DPILRnmoyexFturB81bDGAw+jwiOZbCXPRZPlh/FrAhEtxZ vssArszszSvYGJIsrV1W4kRd0BPR/Fwx9JXoOLuYMOXUNbC06B+R3mFOcZmRJbr2B1DN/ v53tY+yTqEEYel5WEFe1hqxyRqmjW1gueNpRF/4hid1Kw+F6pzRFUyHnCI9Xz8+TIQKaI Scsz3QOoDyqXpYI4yIAr4cOtgMKpbHCxBSkBNXbVYVTh7c1x/EMDvHC34r4hOTmgf0NF+ V6AYiPnMiRlC5hkcfW+ukDkYaN3QMa+Ct5IlS46a5o2G2JESRXQYyk80elXKUtCDJeg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794407250; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=//h5RfNH660G62thM//ZyP86ysjStinj/DfOeNNWOEM=; b=aGX6KNPQ5L7/usa0wgP4+r8jAan/2/Zh1B0KgeoC7tZofZGK8VojfrnEQ4baen0zDAGz dkwKwf5LAuvIGlikeUs4mUwQvdVDutrX8WiQetWoXipuE0Y0A9nHQambGNRhVXaVhdMR4 PUKKIITRDCvtt1l1ufoqotQSUOOlvh3UO/Ifc9+uOHU64qoK3hFOVe0H6rM7Njrf3eeVp uqXagZYS9Rd5suRwf6RbFuR7Fxxsp8Ke7HOl7seHxKT21B55OG8S73OrJcM5Nt90MQTMR foR1ukmj3beg2npWbZnKD+ZFhophnLPb0Uc0E3RbtCOJ6PN+63NCZDjYuxP3TsAClHA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=aAinBjw0; 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 56A4E606A327 for ; Wed, 11 Nov 2026 14:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=aAinBjw0 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FFD91F00A07; Wed, 11 Nov 2026 14:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794407250; bh=//h5RfNH660G62thM//ZyP86ysjStinj/DfOeNNWOEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aAinBjw04m/Bw9tk+HPLI9QtmPhOoyAReKpNhgPV/7x3fPk4pgVW6s4TNBswi1zjD YQsPX0s4jsJ6rt9uCFnNrbE3IMSUaZ0ZH5X7MOtc7TC7IVsOw1e7FoLKfCYJQ95LtG F80XoJwfXQfyDqmuCR/QvUWHBYXSiHxs84UbVa0ZD4uK9b0DyAAbYbblIjimEickh7 uwwLyTdmX1PqqVRLUX3dE66DEDyRZxud/dfWJb+DurP/9koA6NhX1m/ShaEhAViujB b+JQZELKy/quiUC0TkJng5Rn+TKosHngVlITlkYVzFhy4EJIjmUDCnsMf31jobAkmD oDIgeJxn7BukQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Giorgi Kobakhia , Andrew Morton , Xiang Mei , Joseph Qi , Mark Fasheh , Joel Becker , Sasha Levin Subject: [PATCH 6.1.y 2/2] ocfs2: fix array out of bound access in __ocfs2_find_path() Date: Wed, 11 Nov 2026 09:27:26 -0500 Message-ID: <20261111142707.2335918-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261111142707.2335918-1-sashal@kernel.org> References: <20261107054844-failed-6.1-6193ce7896af@kernel.org> <20261111142707.2335918-1-sashal@kernel.org> 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 From: Giorgi Kobakhia [ Upstream commit 6193ce7896afb52a321a0063c8b6a45e477a84e2 ] __ocfs2_find_path() walks down the extent tree and records path by calling find_path_ins(), which appends entry to path->p_node[]. It only has 5 spots. A corrupted ocfs2 image whose extent block is pointing to itself causes __ocfs2_find_path() descent endlessly, writing past the end of path->p_node[] array. UBSAN: array-index-out-of-bounds in fs/ocfs2/alloc.c:677:14 index 5 is out of range for type 'ocfs2_path_item [5]' Call Trace: find_path_ins (fs/ocfs2/alloc.c:677 fs/ocfs2/alloc.c:1914) __ocfs2_find_path.constprop.0 (fs/ocfs2/alloc.c:1882) ocfs2_commit_truncate (fs/ocfs2/alloc.c:1924 fs/ocfs2/alloc.c:7286) ocfs2_truncate_file (fs/ocfs2/file.c:515) ocfs2_setattr (fs/ocfs2/file.c:1224) notify_change (fs/attr.c:556) do_truncate (fs/open.c:68) do_ftruncate (fs/open.c:194 (discriminator 1)) ksys_ftruncate (fs/open.c:206) __x64_sys_ftruncate (fs/open.c:211 fs/open.c:209 fs/open.c:209) Commit a406aff8c051 ("ocfs2: validate l_tree_depth to avoid out-of-bounds access") already restricts el->l_tree_depth to be less than OCFS2_MAX_PATH_DEPTH, which is equal to 5. However, does not handle the infinite descent case. Check if the el->l_tree_depth decreases on each descent. Maximum descents are restricted to 4 and the path->p_node[] array does not overflow. Link: https://lore.kernel.org/20260922202159.2421642-1-gkobakhi@asu.edu Fixes: dcd0538ff4e8 ("ocfs2: sparse b-tree support") Signed-off-by: Giorgi Kobakhia Signed-off-by: Andrew Morton Tested-by: Xiang Mei Reviewed-by: Joseph Qi Assisted-by: LLM Cc: Mark Fasheh Cc: Joel Becker Cc: Signed-off-by: Sasha Levin --- fs/ocfs2/alloc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index e5d446d78e817..4327363dfea45 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -1789,6 +1789,7 @@ static int __ocfs2_find_path(struct ocfs2_caching_info *ci, int i, ret = 0; u32 range; u64 blkno; + u32 prev_depth = OCFS2_MAX_PATH_DEPTH; struct buffer_head *bh = NULL; struct ocfs2_extent_block *eb; struct ocfs2_extent_list *el; @@ -1796,14 +1797,16 @@ static int __ocfs2_find_path(struct ocfs2_caching_info *ci, el = root_el; while (el->l_tree_depth) { - if (unlikely(le16_to_cpu(el->l_tree_depth) >= OCFS2_MAX_PATH_DEPTH)) { + if (unlikely(le16_to_cpu(el->l_tree_depth) >= prev_depth)) { ocfs2_error(ocfs2_metadata_cache_get_super(ci), - "Owner %llu has invalid tree depth %u in extent list\n", + "Owner %llu has invalid tree depth %u in extent list (max %u)\n", (unsigned long long)ocfs2_metadata_cache_owner(ci), - le16_to_cpu(el->l_tree_depth)); + le16_to_cpu(el->l_tree_depth), prev_depth - 1); ret = -EROFS; goto out; } + prev_depth = le16_to_cpu(el->l_tree_depth); + if (!el->l_next_free_rec || !el->l_count) { ocfs2_error(ocfs2_metadata_cache_get_super(ci), "Owner %llu has empty extent list at depth %u\n" -- 2.53.0