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 60FE53905F4; Fri, 4 Sep 2026 05:46:56 +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=1788500818; cv=none; b=r6duNOv1gkNresEa3yga4vMS98RtHYaQPhVQ6mV7rYSsZbRHv3IaYn7IBWfeTrLUO0XUAE2D7KSGBlZjONobVFolkCQO71L+b7vepHqugM8bxnaqGzgoUWrTqvmsBFJ/+840MlWQ0q9YBdiBL5I4hxVP5pWT0x/uCe+YUGM4DWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500818; c=relaxed/simple; bh=XyV3QCygWTdQDYg+E/MUJWQ7l94FL2YQzP1VrjMMRAg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XPSi1LDhYu3hWHwSeERzpHb/35Lk15dl8ZZJEA6MjO9+w3haSenT75eHNXf1oC1GtDjQo+eNnpEbTTPeoxjMa5zgGGKGUfHK8i+ppUFFqcUGifQ1c5pYnrCBKPtCbWm3k+s4VBzPG6NEqxmJXVBwQVzCyTmTWpNt8aqAzKJGJbc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oSZoAvc/; 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="oSZoAvc/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEB071F00A3D; Fri, 4 Sep 2026 05:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788500816; bh=nmGbmppCXm+ETrW/+pcMDb9eADqhSgedmT9Fw1/ZwVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oSZoAvc/BK1zUhYuFOT0Gr3w+gkmQTYUhCgq7er2PTT6HEPg2OOi+hKjNwW2DFzBN nsdfo7K/vwLihHYR0dNS8cXcvl1Fw008rCYrMIOO7jnPaQAZ/iz/4hvrV+ZFwXFDU5 bSE+76S1VrurwXOwTTa8osHCSFamaScc8ZBH67io= 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.18 190/552] fs/ntfs3: bound page_lcns[] index by the log record Date: Fri, 4 Sep 2026 06:55:47 +0200 Message-ID: <20260904045753.322063588@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-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, @@ -5091,6 +5099,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;