From: lei lu <llfamsec@gmail.com>
To: almaz.alexandrovich@paragon-software.com, ntfs3@lists.linux.dev
Subject: [PATCH] ntfs3: Add bounds checking for dp0
Date: Mon, 1 Jul 2024 18:29:35 +0800 [thread overview]
Message-ID: <20240701102935.3018-1-llfamsec@gmail.com> (raw)
Added out-of-bound checking for *dp0 (DIR_PAGE_ENTRY_32).
Signed-off-by: lei lu <llfamsec@gmail.com>
---
fs/ntfs3/fslog.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 855519713bf7..af6f2ce9ea68 100644
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -4184,10 +4184,14 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
dp = NULL;
while ((dp = enum_rstbl(dptbl, dp))) {
struct DIR_PAGE_ENTRY_32 *dp0 = (struct DIR_PAGE_ENTRY_32 *)dp;
- // NOTE: Danger. Check for of boundary.
- memmove(&dp->vcn, &dp0->vcn_low,
- 2 * sizeof(u64) +
- le32_to_cpu(dp->lcns_follow) * sizeof(u64));
+ // Check for of boundary.
+ u32 len = 2 * sizeof(u64) +
+ le32_to_cpu(dp->lcns_follow) * sizeof(u64);
+ if (PtrOffset(dptbl, &dp0->vcn_low) + len > t32) {
+ err = -EINVAL;
+ goto out;
+ }
+ memmove(&dp->vcn, &dp0->vcn_low, len);
}
end_conv_1:
--
2.34.1
next reply other threads:[~2024-07-01 10:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-01 10:29 lei lu [this message]
2024-07-08 19:52 ` [PATCH] ntfs3: Add bounds checking for dp0 Kees Cook
2024-07-09 3:16 ` lei lu
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=20240701102935.3018-1-llfamsec@gmail.com \
--to=llfamsec@gmail.com \
--cc=almaz.alexandrovich@paragon-software.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.