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 DB12318A93F; Sat, 12 Sep 2026 14:26:49 +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=1789223211; cv=none; b=OYFBLSLhbI/pqu1qzOwfiaKtnSvhIp1fq3zOx/K9/Gsv/U2ODMjvcU31RGMUZSKPbkuBINuQrGutXCHCTDVfMSRNv2U0JwsaA+MgyaF30bt4axeoY/kZwS9thoc5dDtyefqNRkboHSyzUoobKOdZOmCfvXtIwT02fDTAL7XQSis= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789223211; c=relaxed/simple; bh=aumwwRTMkjD5gVdvfB3fRLEW0iWsvE+LhSNQ1bBVd8k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=az8qH07aSWOwYO4FIbcpaxM/FPRSuwCq7CFIZVVlEnDv6tc2GUiDVTwG7oSUxUEk+KCB7MIKaCOoZ8MNiFvsgKVXEdOzMBT+w/3S3jSrZ0ePjqgpGdyl+eiB1rarmcPBdGGYj2DpyYJkCaGGz2xO99ExIsPqhZ93cBHU8yKUF5w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cJN+r6xj; 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="cJN+r6xj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F9F11F000FF; Sat, 12 Sep 2026 14:26:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789223209; bh=AFQX6x1eQ9qHQu6nwo+RgT8KMfVB5AL+oHOHdP1aRRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cJN+r6xjvo7+OSrHGuha+/LsFDumgOHIsm8SIuP13kyKU+rUf65UUk01xgx8lIUbK zrXi0ARRwnngdRb59xiz3ntme//uVUNchVfc8lE6B2w95qkChFCzDRNkFrVuQG09MB aQRb7qmkwCuNmn+1jhAp3faNspCBrxVX+CT2wbb4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, lei lu , Konstantin Komarov , Sasha Levin Subject: [PATCH 6.6 0743/1424] fs/ntfs3: Add more checks in mi_enum_attr (part 2) Date: Sat, 12 Sep 2026 08:52:55 +0200 Message-ID: <20260912065623.937443358@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 [ Upstream commit a8f659ce14f8f734894227ba2c5ca78c8451501e ] Add offset check before access to attr->non_res field as mentioned in [1]. [1] https://lore.kernel.org/ntfs3/20241010110005.42792-1-llfamsec@gmail.com/ Suggested-by: lei lu Signed-off-by: Konstantin Komarov Stable-dep-of: 7c4841e2a627 ("fs/ntfs3: fix slab-out-of-bounds write in ni_create_attr_list()") Signed-off-by: Sasha Levin --- fs/ntfs3/record.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c index f810f0419d25e..61d53d39f3b9f 100644 --- a/fs/ntfs3/record.c +++ b/fs/ntfs3/record.c @@ -212,7 +212,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr) return NULL; if (off >= used || off < MFTRECORD_FIXUP_OFFSET_1 || - !IS_ALIGNED(off, 4)) { + !IS_ALIGNED(off, 8)) { return NULL; } @@ -236,8 +236,11 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr) off += asize; } - /* Can we use the first field (attr->type). */ - /* NOTE: this code also checks attr->size availability. */ + /* + * Can we use the first fields: + * attr->type, + * attr->size + */ if (off + 8 > used) { static_assert(ALIGN(sizeof(enum ATTR_TYPE), 8) == 8); return NULL; @@ -259,10 +262,17 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr) asize = le32_to_cpu(attr->size); + if (!IS_ALIGNED(asize, 8)) + return NULL; + /* Check overflow and boundary. */ if (off + asize < off || off + asize > used) return NULL; + /* Can we use the field attr->non_res. */ + if (off + 9 > used) + return NULL; + /* Check size of attribute. */ if (!attr->non_res) { /* Check resident fields. */ -- 2.53.0