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=1794590742; b=imzFrS4cEfLTylpwvK33rHNLmc1Lk6ZxWZkNmm9PF03sPVGkcEp0yzd0D04YeHattGwO ulqKxSnOikfQ0PpE1Q6uLrMUd60OTCSWuu46PeHWOw/Wfxz7hdnXM3NybiD8GO8NC87KU aBEd6R937ddsdeLJSInqM6cXjamsF29ZtzSM42YpvLR8ezZFQbwFkokN5Woog5q9zKVL8 LaqZWm6KNEy98Ha2RVHDl+JDM5c8vrgychPsHK3dSECVxL8cbcatKc5p6C9qEm4aL729v YTiRx/1AhQAFFPNigqFFxAYMJuRykFcdOwt0hBuTK5u8ORNbvm4LbcHF/my9kYHJbig== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590742; 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=IT5+sge8Krbl+u2LdvojjZb25ozA7U+guPL8sD9rnvo=; b=yxlEugAQJ6wkY6mO6Oh3kYeL4oqmz0NtAp0X+xkEe0eAlrIwHtADsIqWQnxG2yaBN7w/ x37tNCw2yusgwWIz7otI4Wk9y8MCm5rpQ95D5fI6F9GxDFRUhz/m4wYpIbZXVnVIP8UZ/ QGvuTNk7hAM+aJVj0oMub2iRl7JvCL/ynOk462/Hwd7UfGxX33mIFX8Fq/qEBSLwjwX3l 9HitDV3kRCVV1cpvckEwcycW56ekERz0Agl46iWmK3s7qB154MtvMrY6C0wUGnu7lL3kM 1g7OeYeyCxFMS5v9smIBjS9waPevtlJUBUN8SP65kQMPRsWugh8lQyTgE3ESKtEVEww== 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=NnYfD3FE; 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 07400607B5A3; Fri, 13 Nov 2026 17:25:41 +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=NnYfD3FE Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DC8C1F000C6; Fri, 13 Nov 2026 17:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590741; bh=IT5+sge8Krbl+u2LdvojjZb25ozA7U+guPL8sD9rnvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NnYfD3FEY1W/RD/CnFwU+8nVnwK8SZmp87xAeU5JVIbipxHQdMGAkpOKqPY85DEZH vVjNUWzJQ82VC7bge2MmGadO5qys8fac7n02ZcSjOyGZq3wzmn8aERMlrxD8vafwQa RVfsHKXO+1gGnms5zKPCJmJm5o1EURS4mj76jfZk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Giorgi Kobakhia , Andrew Morton , Xiang Mei , Joseph Qi , Mark Fasheh , Joel Becker , Sasha Levin Subject: [PATCH 6.18 642/686] ocfs2: fix array out of bound access in __ocfs2_find_path() Date: Fri, 13 Nov 2026 10:52:55 -0500 Message-ID: <20261113153843.544281123@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ 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 58f92a02ed68a..c12154014b892 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -1796,6 +1796,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; @@ -1803,14 +1804,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