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 806F7472F86; Tue, 21 Jul 2026 18:31: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=1784658690; cv=none; b=XW7RxL0VjHDYrJ/XziDmagDydMiXy6niAHBuobZDgi0jFXcevr1pG+59lMH38fxlcS7hDvz6q0AnXGevTjvo4/3gD2Q8z9UN1AZPbbwB5z37fZmEyyPmTa/k+8KlNTOVyaWJOxrUkDTw1wuMF5LLuNAaJWkwDYO9O2CUbYSQpio= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658690; c=relaxed/simple; bh=h1V0F8R0I4rUwNvuarQxrxh5fIdAu2PTtCkWkQFqW+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=baxEvCKfjJmcUYaQupJu3e6bbWbEKvh5jGdF7V7IIAHEtsJ5jmRKfK8a3aPxuOYlqB76F6kz5j4oE1WgnzeC2/yc9IidnHfyyRph7KP1g1bHwEOlJxSRWiECUp+Y2aBpEokYCa7Cl0bRrN2nbxqmgYgjQGa8hOSmGK9aM0uDVmI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QTYx+nXb; 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="QTYx+nXb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B8E81F000E9; Tue, 21 Jul 2026 18:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784658689; bh=9nAlH45/bQF4+EgRiJfyYIhzCgsV5IomF1sTird/pn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QTYx+nXbUTdRxH1437Na2UZu9E4/VcJfqO406I+ehTPeCbWPWbUTB7GM5L1KK5Gxe bNiduo0PKVr7Qvo4uDBHWH81MDG4pPZjGLk2FOXYlZjq20bHXhj5LLtpaTekiiY6Br fFpR+I3a6xk+nbLBwmXKEQsJOBUwDj5Zb55Rt8Pk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Bommarito , Konstantin Komarov Subject: [PATCH 6.18 1237/1611] fs/ntfs3: bound attr_off in UpdateResidentValue against data_off Date: Tue, 21 Jul 2026 17:22:33 +0200 Message-ID: <20260721152543.263863991@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Konstantin Komarov commit d1570c48f49a693974d000251030370ee2e83539 upstream. In do_action()'s UpdateResidentValue case (fslog.c:3307), lrh->attr_off and lrh->redo_len come from the on-disk LRH. When they satisfy aoff + dlen < attr->res.data_off, the assignment attr->res.data_size = cpu_to_le32(aoff + dlen - data_off); underflows to ~4 GiB (e.g. 0xFFFFFFF9 when aoff=0x10, dlen=1, data_off=0x18). Subsequent code that reads attr->res.data_size to walk the resident attribute payload would then read up to 4 GiB past the 1024-byte MFT record allocation. The existing mi_enum_attr() defense in fs/ntfs3/record.c:287 catches the corrupted data_size on the next attribute walk and fails the mount, but only on the path that walks all attributes. A read site that picks an attribute by name and reads its data_size without re-validating is not covered. Validate aoff against data_off and asize at the source. Reproduced under UML+KASAN on mainline 8d90b09e6741 via pr_warn-only probe: with aoff=0x10 and data_off=0x18, the post-assignment data_size is 0xfffffff9 (mount then fails at -22 from mi_enum_attr). Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito [almaz.alexandrovich@paragon-software.com: clang-formatted the changes] Signed-off-by: Konstantin Komarov Signed-off-by: Greg Kroah-Hartman --- fs/ntfs3/fslog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/fs/ntfs3/fslog.c +++ b/fs/ntfs3/fslog.c @@ -3311,6 +3311,17 @@ skip_load_parent: nsize = ALIGN(nsize, 8); data_off = le16_to_cpu(attr->res.data_off); + /* + * aoff comes from the on-disk lrh->attr_off. Forbid + * writes that begin below the resident attribute's + * data_off (which would overwrite the resident header), + * and forbid aoff + dlen < data_off, which would make + * the data_size assignment below underflow to ~4 GiB. + */ + if (aoff < data_off || aoff + dlen < data_off || + aoff + dlen > asize) + goto dirty_vol; + if (nsize < asize) { memmove(Add2Ptr(attr, aoff), data, dlen); data = NULL; // To skip below memmove().