From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E173326E17B; Tue, 8 Apr 2025 12:49:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116597; cv=none; b=cs+pYPCvxWvYMNqSy6MRI6RywAipZ1C0Voy/w/Y8pXa/E7Q/t6qYtKtobBdAp5hqn9KHvzgFsbWosC7H4V2XB+cseuT+lCMovnhayKMwCJqov2jexctsYeFZbbEmF4DY+6dCiV1UX4iNtRJGIyDAxBh2g4Pn3YAQ9eKq97BeA/Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116597; c=relaxed/simple; bh=QwWKI4h6Gl6kxckcEj1pl/tCsFTLKi6gkQFGefPUdXA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ShdUmjf9F25O4YYwymlY1q6uIoHeHWyxOswmyuDL/LT1DwtouxENC+lGEUVnrvmVyFWiovSksowG7uJwoNmUcdix53aSqy43WvyEnlL6CjGrNWH9oQLy+LNO9aB5Nc4lTzJLb9qlzE5Yp/BZiG9iPNfmQdTo1W5Xk5H3AYEk0TQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AMP1C9c2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AMP1C9c2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49B60C4CEE5; Tue, 8 Apr 2025 12:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744116596; bh=QwWKI4h6Gl6kxckcEj1pl/tCsFTLKi6gkQFGefPUdXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AMP1C9c22gmQR+BiJkispIfDBjm4mpZYRuBiTjlwoTGzy8wGJ890lY2ndlbl6hGwe yU+CtmxdvJVgiYmGrKCSz4sK0jj5FfGkoAKx56UYJpu6zAAYYT1i+dHNITrPXSlWHs 9jaQFB+EEkmwkwFbtff68fHRdgs4UmrdDnAvAamY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vasiliy Kovalev , syzbot+66c146268dc88f4341fd@syzkaller.appspotmail.com, Joseph Qi , Joel Becker , Junxiao Bi , Changwei Ge , Jun Piao , Kurt Hackel , Mark Fasheh , Andrew Morton , Sasha Levin Subject: [PATCH 6.12 198/423] ocfs2: validate l_tree_depth to avoid out-of-bounds access Date: Tue, 8 Apr 2025 12:48:44 +0200 Message-ID: <20250408104850.346127038@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104845.675475678@linuxfoundation.org> References: <20250408104845.675475678@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vasiliy Kovalev [ Upstream commit a406aff8c05115119127c962cbbbbd202e1973ef ] The l_tree_depth field is 16-bit (__le16), but the actual maximum depth is limited to OCFS2_MAX_PATH_DEPTH. Add a check to prevent out-of-bounds access if l_tree_depth has an invalid value, which may occur when reading from a corrupted mounted disk [1]. Link: https://lkml.kernel.org/r/20250214084908.736528-1-kovalev@altlinux.org Fixes: ccd979bdbce9 ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem") Signed-off-by: Vasiliy Kovalev Reported-by: syzbot+66c146268dc88f4341fd@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=66c146268dc88f4341fd [1] Reviewed-by: Joseph Qi Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Kurt Hackel Cc: Mark Fasheh Cc: Vasiliy Kovalev Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/ocfs2/alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index ea9127ba32084..5d9388b44e5be 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -1803,6 +1803,14 @@ 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)) { + ocfs2_error(ocfs2_metadata_cache_get_super(ci), + "Owner %llu has invalid tree depth %u in extent list\n", + (unsigned long long)ocfs2_metadata_cache_owner(ci), + le16_to_cpu(el->l_tree_depth)); + ret = -EROFS; + goto out; + } if (le16_to_cpu(el->l_next_free_rec) == 0) { ocfs2_error(ocfs2_metadata_cache_get_super(ci), "Owner %llu has empty extent list at depth %u\n", -- 2.39.5