From nobody Wed Jun 17 05:27:02 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) (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 6869E3D9029; Thu, 23 Apr 2026 07:02:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776927760; cv=none; b=AWHOf11fJHJydZPpacM9ijwzn2xr85s3PKoI4OuPRIfazpuFko1zFPfBLSih0/ttrUpFx++wXyHtCEkxw7d/GDBERNIooUSkr+4jXc4bhQDHkwL4eb5LJ3SFYWqAHaDcJ0jkw+vHLmA4kmXsuzhWyxLSHffSnprNQDenMyzHttI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776927760; c=relaxed/simple; bh=NKyRsoHy8+u6GlWkxqR0tmoYRU16SzCWFRaiDfvxP/c=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=YL5aXs5kXtW3VY6JvQ1+0vLAqo97tU7a/YeYmeeOe1r4rheQXtkpDq5jr8cIeZMTP3/+Fj3Z3XMYb4RPUYslqXQsu4gljy6wlJL7oA7lZb0TL3a53XZAYDe/1r/OQ3coUpjcJIAEqE/ZUkZqlbyUJwNuo5cBxmobVc5r95su004= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=pkJ6PgbO; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="pkJ6PgbO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=UP ZREBmoHaCiqhO8OolVXNN5y0f1XjeBuqwVCXDbkrg=; b=pkJ6PgbOdCCsONPAJ8 GeV6i5qPQCvaasIQ1nvrMUBTsioxsYQCUc6ztilZgVDZgp4kL+hdHM0NWBqu+inc n8PYKPZf2E29smLs+Hts6WxaGv9DEbKdh76pVwb8+uEJVJD5LYtVWPvwlaIyAf60 FI3JVexxZ6HulxWF9OvRhlZ2E= Received: from pek-lpg-core5.wrs.com (unknown []) by gzga-smtp-mtada-g1-4 (Coremail) with SMTP id _____wCnlSbnw+lpIysTBQ--.5955S2; Thu, 23 Apr 2026 15:01:59 +0800 (CST) From: Robert Garcia To: stable@vger.kernel.org, Konstantin Komarov Cc: ntfs3@lists.linux.dev, Robert Garcia , linux-kernel@vger.kernel.org Subject: [PATCH 5.15.y] fs/ntfs3: Add more attributes checks in mi_enum_attr() Date: Thu, 23 Apr 2026 15:01:59 +0800 Message-Id: <20260423070159.3246415-1-rob_garcia@163.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wCnlSbnw+lpIysTBQ--.5955S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr17KFWUtFW8JF48tFWUurg_yoWrJw1kpF 4Yy3y3A3yY9FnFkrsrKF4rZayft34fKFyUGFy2vrnIkF1aqr17Wr98trW0vryfuw4DGFZY krs0ka1fAwnrJr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zMg4S9UUUUU= X-CM-SenderInfo: 5uresw5dufxti6rwjhhfrp/xtbC5ggAa2npw+gqLAAA3o Content-Type: text/plain; charset="utf-8" From: Konstantin Komarov [ Upstream commit 013ff63b649475f0ee134e2c8d0c8e65284ede50 ] Signed-off-by: Konstantin Komarov [ Overflow check deleted to keep context consistent. ] Signed-off-by: Robert Garcia --- fs/ntfs3/record.c | 63 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c index cef53583f9a1..7965bea0b2c8 100644 --- a/fs/ntfs3/record.c +++ b/fs/ntfs3/record.c @@ -193,8 +193,9 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struc= t ATTRIB *attr) { const struct MFT_REC *rec =3D mi->mrec; u32 used =3D le32_to_cpu(rec->used); - u32 t32, off, asize; + u32 t32, off, asize, prev_type; u16 t16; + u64 data_size, alloc_size, tot_size; =20 if (!attr) { u32 total =3D le32_to_cpu(rec->total); @@ -213,6 +214,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struc= t ATTRIB *attr) if (!is_rec_inuse(rec)) return NULL; =20 + prev_type =3D 0; attr =3D Add2Ptr(rec, off); } else { /* Check if input attr inside record. */ @@ -226,6 +228,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struc= t ATTRIB *attr) return NULL; } =20 + prev_type =3D le32_to_cpu(attr->type); attr =3D Add2Ptr(attr, asize); off +=3D asize; } @@ -245,7 +248,11 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, stru= ct ATTRIB *attr) =20 /* 0x100 is last known attribute for now. */ t32 =3D le32_to_cpu(attr->type); - if ((t32 & 0xf) || (t32 > 0x100)) + if (!t32 || (t32 & 0xf) || (t32 > 0x100)) + return NULL; + + /* attributes in record must be ordered by type */ + if (t32 < prev_type) return NULL; =20 /* Check overflow and boundary. */ @@ -254,16 +261,15 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, str= uct ATTRIB *attr) =20 /* Check size of attribute. */ if (!attr->non_res) { + /* Check resident fields. */ if (asize < SIZEOF_RESIDENT) return NULL; =20 t16 =3D le16_to_cpu(attr->res.data_off); - if (t16 > asize) return NULL; =20 - t32 =3D le32_to_cpu(attr->res.data_size); - if (t16 + t32 > asize) + if (t16 + le32_to_cpu(attr->res.data_size) > asize) return NULL; =20 if (attr->name_len && @@ -274,21 +280,52 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, str= uct ATTRIB *attr) return attr; } =20 - /* Check some nonresident fields. */ - if (attr->name_len && - le16_to_cpu(attr->name_off) + sizeof(short) * attr->name_len > - le16_to_cpu(attr->nres.run_off)) { + /* Check nonresident fields. */ + if (attr->non_res !=3D 1) + return NULL; + + t16 =3D le16_to_cpu(attr->nres.run_off); + if (t16 > asize) + return NULL; + + t32 =3D sizeof(short) * attr->name_len; + if (t32 && le16_to_cpu(attr->name_off) + t32 > t16) + return NULL; + + /* Check start/end vcn. */ + if (le64_to_cpu(attr->nres.svcn) > le64_to_cpu(attr->nres.evcn) + 1) + return NULL; + + data_size =3D le64_to_cpu(attr->nres.data_size); + if (le64_to_cpu(attr->nres.valid_size) > data_size) return NULL; - } =20 - if (attr->nres.svcn || !is_attr_ext(attr)) { + alloc_size =3D le64_to_cpu(attr->nres.alloc_size); + if (data_size > alloc_size) + return NULL; + + t32 =3D mi->sbi->cluster_mask; + if (alloc_size & t32) + return NULL; + + if (!attr->nres.svcn && is_attr_ext(attr)) { + /* First segment of sparse/compressed attribute */ + if (asize + 8 < SIZEOF_NONRESIDENT_EX) + return NULL; + + tot_size =3D le64_to_cpu(attr->nres.total_size); + if (tot_size & t32) + return NULL; + + if (tot_size > alloc_size) + return NULL; + } else { if (asize + 8 < SIZEOF_NONRESIDENT) return NULL; =20 if (attr->nres.c_unit) return NULL; - } else if (asize + 8 < SIZEOF_NONRESIDENT_EX) - return NULL; + } =20 return attr; } --=20 2.34.1