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 5C54134041C for ; Thu, 10 Sep 2026 01:26:12 +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=1789003574; cv=none; b=E97yeycbccc861qJG24JkgMELNUXyOX1gbxsLGi9gE+uPJJu/3ubEeuFhPbVBIEZe9xO3E/U7FDpBXaY7lOtKmvuaSe6De7LZs9sa25OpmEkEA8MglFuI1yejC28K9Qdx2sVNOr2p/ASvSqkvcd0RZan6i7D9NRgKDJY2p3Kv6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789003574; c=relaxed/simple; bh=gHhbcegFI52ltURzNuQjQZ9JQ3HihPiQJWnZQHR26Gs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BW8zdSv3XSzxxMvbZWUi11Rvc+v/pE0t3a1uRWgjj83jxdCa5VafuI5+cQTg6VA8qh0sGOFvGhiN+eOHkKNRM/IQfjkYGQGPN5ZtJ9yBc2qlVoMiBaZ5yG/doUAo/Ngdyo9R2f7O0IwuiGRugAJtt8X7M6c6ratZM0J9x5ACFL4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W/mAd+jU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W/mAd+jU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48A6F1F000FF; Thu, 10 Sep 2026 01:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789003572; bh=5f7BoRCSnyInTL937znHjJbHXrv7ZYBfjGS5+E5QynM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W/mAd+jUN4bqZa8UIe9p5T+u4GLZnUICkLlv9c2BI8Vym7X5tnMj1aAqZR8uAJCwq TMZ39q8LfSP14N5hHCb3ZcqoL1pXQxVbdvaQgFpfKdupnYezjkibUxDbmsuaQc3Z+m fAU1DO7xqa5kEvHKFgrus9AnCAB7XybQqor6qqFuN8TMMxRl8N/NFnkbsjrpyapYJj A6ldqOO9tOe0jGlZR+0eaeW/BJQiOlUEwusE63MKoZ75yhKuxgq1j4nqfqWe/Wblgq x+r7Xy8XDM2FzUQgldPh8nvIptf9gaz9pJ6Iazjp1YTxicz6iYiFDf5zZn1AyH8ffA 0mnw3FtEOC4DQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Konstantin Komarov , lei lu , Sasha Levin Subject: [PATCH 6.12.y 1/4] fs/ntfs3: Add more checks in mi_enum_attr (part 2) Date: Wed, 9 Sep 2026 21:26:07 -0400 Message-ID: <20260910012610.3866859-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090803-refract-segment-1a96@gregkh> References: <2026090803-refract-segment-1a96@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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