From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 692D633F59A; Sat, 12 Sep 2026 13:33:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789220023; cv=none; b=iPvByL2hSObG3Jr+JFt48HPDyHipgl6Um+p7Wk8jBhbDJgSvw2fFZ6Ch0YD/BTr/yRymyjMfObCVAGDyfxoOkkalru0A0m+jcYa8TpWxXgqi2fKitTM0uFo3ihhHipLjsnfbAui6Qwmp91/ZNgxkcyrfXWbHHiD5DNTsqWvcv30= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789220023; c=relaxed/simple; bh=G/zSH0AP41x3vj6ItpW6WIU/1YKkAH6YbyuruzlLgpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VucLu+LWpoc3vu2jd9Vl6bad/n8J8TO5jbbmqO4hWMmM2Q+5Mj8Mfd3/yCa9bcWIWc4VecpkHk6r/ymFkCtJVfPboFRBvpfZJvNurugznBQAP4HkWXiaBoFpMVUbF5QYwMgKKrho8CPdvbEP9lWo/3Ewu4D+NL6Rq9x9M2nd294= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=U5HbpGJH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="U5HbpGJH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 247C11F000FF; Sat, 12 Sep 2026 13:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789220022; bh=7F/3C/5aeksN8A51Kb373mMAD3x+8gR72l4sWYHgtZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U5HbpGJHq2ouq+8wGc8+GB9bIVB0ZHSIwPIwJem6bsEVYkdDQONaUTg8oPplT0wD6 1CDY1wniMaYxcik00xktfL1JJhAQg7Mvk+PxiuAStTWDV1cQg2CP2ENftPx5XuoXQG a+OF022zoz8A4A3KK1JwneJSc1l9IaNE3Wasw4oE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Weiming Shi , Xiang Mei , Konstantin Komarov Subject: [PATCH 6.6 0092/1424] fs/ntfs3: bound page_lcns[] index by the log record Date: Sat, 12 Sep 2026 08:42:04 +0200 Message-ID: <20260912065609.366278710@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.279695368@linuxfoundation.org> References: <20260912065607.279695368@linuxfoundation.org> User-Agent: quilt/0.69 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Konstantin Komarov commit 6f7b9dbdc1b7520206abce0049bdd143eb536e75 upstream. The copy_lcns loop and the redo shorten loop index page_lcns[] at j + i, where i runs up to the log record's lcns_follow. That count is checked only against the record's own length, not the target entry, so check_dp_table() (which validates the entry's lcns_follow) does not cover it: the copy_lcns entry may even be freshly allocated after that check, and find_dp() bounds j but not i. A crafted record thus overflows page_lcns[] of an otherwise valid entry. Add dp_range_ok() and reject, before each loop, any record whose run does not fit the entry. These are the only two page_lcns[] accesses indexed by the record rather than the entry, so together with the entry validation every access is now bounded. Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal") Cc: stable@vger.kernel.org Reported-by: Weiming Shi Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Xiang Mei [almaz.alexandrovich@paragon-software.com: original patch contained changes to the problem already handled, applied partly] Signed-off-by: Konstantin Komarov Signed-off-by: Greg Kroah-Hartman --- fs/ntfs3/fslog.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) --- a/fs/ntfs3/fslog.c +++ b/fs/ntfs3/fslog.c @@ -648,6 +648,14 @@ static inline void *enum_rstbl(struct RE } /* + * dp_range_ok - true if [j, j + count) fits in a page_lcns[cap] array. + */ +static inline bool dp_range_ok(size_t j, u32 count, u32 cap) +{ + return j < cap && count <= cap - j; +} + +/* * find_dp - Search for a @vcn in Dirty Page Table. */ static inline struct DIR_PAGE_ENTRY *find_dp(struct RESTART_TABLE *dptbl, @@ -5095,6 +5103,13 @@ find_dirty_page: /* Shorten length by any Lcns which were deleted. */ saved_len = dlen; + if (!dp_range_ok(le64_to_cpu(lrh->target_vcn) - le64_to_cpu(dp->vcn), + le16_to_cpu(lrh->lcns_follow), + le32_to_cpu(dp->lcns_follow))) { + err = -EINVAL; + goto out; + } + for (i = le16_to_cpu(lrh->lcns_follow); i; i--) { size_t j; u32 alen, voff;