From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
Robert Morris <rtm@csail.mit.edu>,
Sasha Levin <sashal@kernel.org>,
ntfs3@lists.linux.dev
Subject: [PATCH AUTOSEL 6.7 23/58] fs/ntfs3: Fixed overflow check in mi_enum_attr()
Date: Mon, 12 Feb 2024 19:17:29 -0500 [thread overview]
Message-ID: <20240213001837.668862-23-sashal@kernel.org> (raw)
In-Reply-To: <20240213001837.668862-1-sashal@kernel.org>
From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
[ Upstream commit 652cfeb43d6b9aba5c7c4902bed7a7340df131fb ]
Reported-by: Robert Morris <rtm@csail.mit.edu>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ntfs3/record.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c
index 7b6423584eae..6aa3a9d44df1 100644
--- a/fs/ntfs3/record.c
+++ b/fs/ntfs3/record.c
@@ -279,7 +279,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)
if (t16 > asize)
return NULL;
- if (t16 + le32_to_cpu(attr->res.data_size) > asize)
+ if (le32_to_cpu(attr->res.data_size) > asize - t16)
return NULL;
t32 = sizeof(short) * attr->name_len;
--
2.43.0
next prev parent reply other threads:[~2024-02-13 0:19 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 0:17 [PATCH AUTOSEL 6.7 01/58] fs/ntfs3: Improve alternative boot processing Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 02/58] fs/ntfs3: Modified fix directory element type detection Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 03/58] fs/ntfs3: Improve ntfs_dir_count Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 04/58] fs/ntfs3: Correct hard links updating when dealing with DOS names Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 05/58] fs/ntfs3: Print warning while fixing hard links count Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 06/58] fs/ntfs3: Reduce stack usage Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 07/58] fs/ntfs3: Fix multithreaded stress test Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 08/58] fs/ntfs3: Fix detected field-spanning write (size 8) of single field "le->name" Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 09/58] fs/ntfs3: Correct use bh_read Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 10/58] fs/ntfs3: Add file_modified Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 11/58] fs/ntfs3: Drop suid and sgid bits as a part of fpunch Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 12/58] fs/ntfs3: Implement super_operations::shutdown Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 13/58] fs/ntfs3: ntfs3_forced_shutdown use int instead of bool Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 14/58] fs/ntfs3: Add and fix comments Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 15/58] fs/ntfs3: Add NULL ptr dereference checking at the end of attr_allocate_frame() Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 16/58] fs/ntfs3: Fix c/mtime typo Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 17/58] fs/ntfs3: Disable ATTR_LIST_ENTRY size check Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 18/58] fs/ntfs3: Use kvfree to free memory allocated by kvmalloc Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 19/58] fs/ntfs3: use non-movable memory for ntfs3 MFT buffer cache Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 20/58] fs/ntfs3: Prevent generic message "attempt to access beyond end of device" Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 21/58] fs/ntfs3: Use i_size_read and i_size_write Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 22/58] fs/ntfs3: Correct function is_rst_area_valid Sasha Levin
2024-02-13 0:17 ` Sasha Levin [this message]
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 24/58] fs/ntfs3: Update inode->i_size after success write into compressed file Sasha Levin
2024-02-13 0:17 ` [PATCH AUTOSEL 6.7 25/58] fs/ntfs3: Fix oob in ntfs_listxattr Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240213001837.668862-23-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=rtm@csail.mit.edu \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox