From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
To: <ntfs3@lists.linux.dev>
Cc: <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 4/5] fs/ntfs3: Fixed overflow check in mi_enum_attr()
Date: Mon, 29 Jan 2024 11:09:16 +0300 [thread overview]
Message-ID: <92465892-aad4-428d-bcfe-03584d302bb5@paragon-software.com> (raw)
In-Reply-To: <dedce962-d48d-41d6-bbbf-e95c66daba80@paragon-software.com>
Reported-by: Robert Morris <rtm@csail.mit.edu>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
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.34.1
next prev parent reply other threads:[~2024-01-29 8:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 8:06 [PATCH 0/5] fs/ntfs3: Bugfix Konstantin Komarov
2024-01-29 8:07 ` [PATCH 1/5] fs/ntfs3: Prevent generic message "attempt to access beyond end of device" Konstantin Komarov
2024-01-29 8:08 ` [PATCH 2/5] fs/ntfs3: Use i_size_read and i_size_write Konstantin Komarov
2024-01-29 8:08 ` [PATCH 3/5] fs/ntfs3: Correct function is_rst_area_valid Konstantin Komarov
2024-01-29 8:09 ` Konstantin Komarov [this message]
2024-01-29 8:09 ` [PATCH 5/5] fs/ntfs3: Update inode->i_size after success write into compressed file Konstantin Komarov
2024-02-11 12:31 ` [PATCH 0/5] fs/ntfs3: Bugfix Linux regression tracking (Thorsten Leemhuis)
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=92465892-aad4-428d-bcfe-03584d302bb5@paragon-software.com \
--to=almaz.alexandrovich@paragon-software.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).