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 017AE384230; Sat, 12 Sep 2026 15:28:29 +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=1789226910; cv=none; b=CCkAzoh/iRXkYyJlXRz7KJ0EBtJ/gTG05/u5l9SzC4PkR3umReiNqz9JZ/nzX+oak8fLRHffmRe8kGY/tZsvsEni/XOn33/bY6CJFkaeshB9YPXyeEmLDF8nRrXYNNNOzuaj5Oclsd2rQJ3N8Bnu1SVPpFHQk4V1Gtkz4W/2+GQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789226910; c=relaxed/simple; bh=uAHMdkh05xiS/TDWwx7hyNgB/hUNBaFV2NHtFEhBW5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VomMXnVeg7kYLIIBkG/1F0Yxb50JqyGLcRPUi1XkZnLjOcZr/c6zCfe083O9jp4pMD7Q+jH3Zeg1AKaVAWdOzkeabtMH92lcWHQp+SBei2KIE59pkt3FNDqSn6+7GVIkOxWGEgF2ApsS65sxaxADm4HTN11UMuKBvfBZJL5StVA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VlSqavq4; 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="VlSqavq4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6CE21F000FF; Sat, 12 Sep 2026 15:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789226908; bh=bT070znlIS1SxaXJdcdGjx1dgPoq9De3zdbg6c6tue8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VlSqavq4FVdxmWNtv8DoydA3LHuwAEasg6jFvCDEgQLHAJAXCKIZDkR0/TJeP5K7Q SkLQAe5pMXWk86H8IJQojB6M7CBkH+HKCrIZbdFrx7xzZHYL2XqDev9pkY08txsoZi wVXcqC41Eesp6V04BUQ5siW5urln6AXnVFEZfbHA= 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.1 0074/1191] fs/ntfs3: validate dirty page table on log replay Date: Sat, 12 Sep 2026 08:46:42 +0200 Message-ID: <20260912065549.826190539@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiang Mei commit 006cb7713dec10368e699abc4367e5faa334c9a5 upstream. Each DIR_PAGE_ENTRY ends in a page_lcns[] array whose length is the on-disk lcns_follow field. check_rstbl() validates the table bookkeeping but never checks that this array fits in the entry, so a crafted lcns_follow lets the v0->v1 conversion memmove and later replay passes run off the entry. Add check_dp_table() to reject, right after check_rstbl(), any entry larger than its size claims via struct_size() (the same expression used to allocate these entries, so the check is overflow-safe by construction). All consumers can then trust lcns_follow as the real capacity. This covers every page_lcns[] access whose index is bounded by the entry itself (the conversion memmove, the HotFix store via find_dp(), and the self-bounded scan loops). Accesses whose index comes from the log record need a separate bound and are handled in a follow-up patch. 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 Signed-off-by: Konstantin Komarov Signed-off-by: Greg Kroah-Hartman --- fs/ntfs3/fslog.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) --- a/fs/ntfs3/fslog.c +++ b/fs/ntfs3/fslog.c @@ -789,6 +789,20 @@ static bool check_rstbl(const struct RES return true; } +static bool check_dp_table(const struct RESTART_TABLE *dptbl) +{ + u32 rsize = le16_to_cpu(dptbl->size); + struct DIR_PAGE_ENTRY *dp = NULL; + + while ((dp = enum_rstbl((struct RESTART_TABLE *)dptbl, dp))) { + if (struct_size(dp, page_lcns, le32_to_cpu(dp->lcns_follow)) > + rsize) + return false; + } + + return true; +} + /* * free_rsttbl_idx - Free a previously allocated index a Restart Table. */ @@ -4283,6 +4297,11 @@ check_dirty_page_table: err = -EINVAL; goto out; } + + if (!check_dp_table(rt)) { + err = -EINVAL; + goto out; + } dptbl = kmemdup(rt, t32, GFP_NOFS); if (!dptbl) {