From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794361627; b=gTOZbBjc3MRxHZfosEYXLJmKJ7nrfPylNzZ5fGnkLkWsFfxNXJJKdrBAP+QoDHR8//6W oq0Pgzw7Dm17J4Zxe6xOlqOJsBVRiy3FRBkijr96GoYz60rzen/SSgFjgjnLjZ6bwoC45 6bcaCf1Tjc7kje4rhzMxvbEOI6fmcy0PRqSBMAS+hA9p2dgMG/bmHeVJRb5wtgrrKM/s+ /aRZJm7DBw+Xy/4huczU2t1+ZFa/m1GZ9/K41D4hV1ywdhtvMltUbdfqc1d5WiAyRUmwy afwxaKiBzkDEbjc/SzNRslAarCZvZk2nR43KeSOkU2NVfch4dIhokq/Efxxgw4smZyA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794361627; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=smtmW/DgLXbxjLFXmGfuEyJE0fao/5APyCN/AswA/WU=; b=0x83pO6BICCLoAEtMWfOwI8eLyOahBNXZ159g/xpb3XNkNOF7UoVGu+0ZpJOLJpApk4n zX+4PXm5xY205agrY/u5GQlqQQFEMHoRBjXxjV1tFUtgZIdYybufLgtEt5XceHDraxQnC brEjokZPp8PPxh9749WYsNU9uC3qKZ7nAuOmOzWO7KGYXUalRs0wWPSqFvix99D/R/3P1 JVAoBEAMflrFGb7VBbNbStmiQTZ2BWHRV2ERlFHQdOgZLFZLc+5wMcMkCYiSop02Jvnzn BUR8CT7dEJnH5qRqWidy2QRgfcytHNS9jxjZD6+M1ybF5g7n7EYeDTbs4nY6djN42Ng== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b="LI+Ri/w7"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D743A606A32E for ; Wed, 11 Nov 2026 01:47:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=LI+Ri/w7 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FEF21F0093C; Wed, 11 Nov 2026 01:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794361627; bh=smtmW/DgLXbxjLFXmGfuEyJE0fao/5APyCN/AswA/WU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LI+Ri/w7e5bevLk+Wdja72YlFqv6KgwUIcmwyZmVJVINGcUBsjbZxq+Ppdnk/K3td oK3FBM/Z4NMq4iHeznJ0i8bbzenvN6r0CcBYTrNUFWQA7xq7OX+aoq6QnOuMrTLd21 DRkMpRcaKNEwk4RtT3AlaGHVFsyqcN3vf0uhsolQfJwPVXDgiXKv9pmFm9kvtkK61K WAHSvCxZnHhf1Spq6oRKsokgKE/JKJ8i9zQyVfDdceMUeyq/QEM7nT/Kahq7Y0EHDm A1qJZfLy84QVPGks+SA4zYAvi+ispgrE5CtwgbnSyH5/Q9wGTpI8Rh0NHwaMrHYp08 tPX7zFeJhgk4g== From: Sasha Levin To: stable@vger.kernel.org Cc: Yuejie Shi , Konstantin Komarov , Sasha Levin Subject: [PATCH 6.1.y 3/3] fs/ntfs3: validate the EA value length in ntfs_read_ea() Date: Tue, 10 Nov 2026 20:47:04 -0500 Message-ID: <20261111014422.420984-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261111014422.420984-1-sashal@kernel.org> References: <20261107055620-failed-6.1-351817226fbf@kernel.org> <20261111014422.420984-1-sashal@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yuejie Shi [ Upstream commit 351817226fbf0031c4c63d1f5d7f15c3172312eb ] ntfs_read_ea() checks the $EA list for consistency, but it only recomputes the packed size of an entry when the entry's own size field is zero: for (off = 0; off < size; off += ea_size) { const struct EA_FULL *ef = Add2Ptr(ea_p, off); u32 bytes = size - off; ... if (ef->size) { ea_size = le32_to_cpu(ef->size); if (ea_size > bytes) goto out1; continue; /* <- elength never checked */ } ... ea_size = ALIGN(struct_size(ef, name, 1 + ef->name_len + le16_to_cpu(ef->elength)), 4); if (ea_size > bytes) goto out1; } ef->size is non-zero for every entry except the last one, and it is what ntfs3 itself writes (ntfs_set_ea() stores exactly that aligned packed size), so in practice elength is not validated at all. find_ea() then uses unpacked_ea_size(), which also prefers ea->size when it is set, so it agrees and hands the entry back. ntfs_get_ea() copies elength bytes with no further bound of its own: len = le16_to_cpu(ea->elength); ... if (len > size) { /* size is the *caller's* buffer */ err = -ERANGE; ... } memcpy(buffer, ea->name + ea->name_len + 1, len); so a caller that supplies a large enough buffer receives up to 64 KiB of whatever follows the small $EA allocation -- straight to userspace via getxattr(2). Compute the packed size unconditionally and require it to fit in the entry. Hoist the "bytes < offsetof(struct EA_FULL, name)" test above the ef->size branch as well: name_len and elength were being read there without it, which is itself a small over-read of the kmalloc'd buffer when fewer than 8 bytes are left. The old "bytes < sizeof(ef->size)" test is subsumed by it. # mkntfs image; create /mnt/ntfs/poc with user.ntfs6 set, then rewrite # that EA_FULL's elength from 0xf to 0xff00 on the raw device mount -t ntfs3 -o ro /dev/vda /mnt/ntfs getxattr("/mnt/ntfs/poc", "user.ntfs6", buf, 128 * 1024); BUG: KASAN: slab-out-of-bounds in ntfs_get_ea+0x294/0x3e0 Read of size 65280 at addr ffff0000cca53acf by task xattr_probe/142 __asan_memcpy+0x3c/0xa0 ntfs_get_ea+0x294/0x3e0 ntfs_getxattr+0x284/0x318 __vfs_getxattr+0x104/0x160 vfs_getxattr+0x1b4/0x1e0 do_getxattr+0xcc/0x230 path_getxattrat+0x184/0x270 __arm64_sys_getxattr+0x64/0x80 Allocated by task 142: __kmalloc_noprof+0x294/0x668 ntfs_read_ea+0x1e4/0x420 ntfs_get_ea+0x2c8/0x3e0 The buggy address belongs to the object at ffff0000cca53a80 which belongs to the cache kmalloc-96 of size 96 The object being over-read is the one ntfs_read_ea() just allocated, and it is 96 bytes. Entries written by ntfs3 and by Windows set size to the aligned packed size, so the new test does not reject anything a working filesystem produces. Fixes: be71b5cba2e6 ("fs/ntfs3: Add attrib operations") Cc: stable@vger.kernel.org Signed-off-by: Yuejie Shi [almaz.alexandrovich@paragon-software.com: applied as-is, logic is the same but the code is cleaner] Signed-off-by: Konstantin Komarov Signed-off-by: Sasha Levin --- fs/ntfs3/xattr.c | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c index 086a926dfdfc0..754839cb85e8e 100644 --- a/fs/ntfs3/xattr.c +++ b/fs/ntfs3/xattr.c @@ -145,49 +145,32 @@ static int ntfs_read_ea(struct ntfs_inode *ni, struct EA_FULL **ea, for (off = 0; off < size; off += ea_size) { const struct EA_FULL *ef = Add2Ptr(ea_p, off); u32 bytes = size - off; - size_t need; - - /* Check if we can use field ea->size. */ - if (bytes < sizeof(ef->size)) - goto out1; + u32 packed_size; /* Check if we can use fields ef->name_len and ef->elength. */ if (bytes < offsetof(struct EA_FULL, name)) goto out1; - /* Size needed to hold this record's name and value. */ - need = struct_size(ef, name, - 1 + ef->name_len + le16_to_cpu(ef->elength)); + /* + * The name and the value have to fit in the entry whether or + * not ef->size is set, because ntfs_get_ea() copies elength + * bytes out of this buffer and checks them only against the + * caller supplied buffer size. + */ + packed_size = + ALIGN(struct_size(ef, name, + 1 + ef->name_len + + le16_to_cpu(ef->elength)), + 4); if (ef->size) { ea_size = le32_to_cpu(ef->size); - /* ef->size must fit the list and cover the record. */ - if (ea_size > bytes || ea_size < need) - goto out1; - if (bytes < offsetof(struct EA_FULL, name)) - goto out1; - - /* Check if we can use fields ef->name_len and ef->elength. */ - if (bytes < offsetof(struct EA_FULL, name)) - goto out1; - - /* - * The declared entry size (ef->size) must be large - * enough to hold the name and value. Otherwise a later - * reader such as ntfs_get_ea() copies ef->elength bytes - * starting past the entry, reading out of bounds of the - * ea buffer and leaking adjacent heap memory to - * userspace via getxattr(). - */ - if (struct_size(ef, name, - 1 + ef->name_len + - le16_to_cpu(ef->elength)) > - ea_size) + if (ea_size > bytes || packed_size > ea_size) goto out1; continue; } - ea_size = ALIGN(need, 4); + ea_size = packed_size; if (ea_size > bytes) goto out1; } -- 2.53.0