From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
To: Michael Bommarito <michael.bommarito@gmail.com>
Cc: <ntfs3@lists.linux.dev>, <linux-fsdevel@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Pavitra Jha <jhapavitra98@gmail.com>
Subject: Re: [PATCH v2] fs/ntfs3: bound NTFS_DE view.data_off in UpdateRecordData{Root,Allocation}
Date: Tue, 9 Jun 2026 09:57:28 +0200 [thread overview]
Message-ID: <189e7066-3d41-4629-8e9a-deea011047eb@paragon-software.com> (raw)
In-Reply-To: <20260519095135.1609973-1-michael.bommarito@gmail.com>
On 5/19/26 11:51, Michael Bommarito wrote:
> In do_action()'s UpdateRecordDataRoot (fslog.c:3489) and
> UpdateRecordDataAllocation (fslog.c:3697) cases, the memmove
> destination is `Add2Ptr(e, le16_to_cpu(e->view.data_off))`,
> where e->view.data_off comes from an on-disk NTFS_DE inside
> an INDEX_ROOT or INDEX_BUFFER. Neither case validates
> view.data_off + dlen against e->size; the existing
> check_if_index_root / check_if_alloc_index helpers walk the
> entry chain and validate the entry's offset, but not its
> internal view fields.
>
> The neighbouring read sites (e.g., fs/ntfs3/index.c when
> iterating view entries) check view.data_off + view.data_size
> <= e->size. Apply the same bound at the two memmove sites.
>
> Reproduced under UML+KASAN on mainline 8d90b09e6741 via
> pr_warn-only probe instrumentation: with view.data_off forced
> to 0xFFFC, the memmove writes 32 bytes past the end of the
> NTFS_DE.
>
> This is similar in shape to Pavitra Jha's 2026-05-02 patch
> "fs/ntfs3: prevent oob in case UpdateRecordDataRoot"
> (<20260502105008.21827-1-jhapavitra98@gmail.com>) which
> proposes calling ntfs3_bad_de_range(); that helper does not
> exist in mainline. This patch uses inline checks.
>
> Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")
> Cc: stable@vger.kernel.org
> Reported-by: Pavitra Jha <jhapavitra98@gmail.com>
> Closes: https://lore.kernel.org/ntfs3/20260502105008.21827-1-jhapavitra98@gmail.com/
> Assisted-by: Claude:claude-opus-4-7
> Signed-off-by: Michael Bommarito <michael.bommarito@gmail.com>
> ---
> v2:
> - Add Pavitra Jha's Reported-by trailer and a Closes tag for
> the original public report, as requested in review.
>
> fs/ntfs3/fslog.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
> index acfa18b84401e..127860fd2ab50 100644
> --- a/fs/ntfs3/fslog.c
> +++ b/fs/ntfs3/fslog.c
> @@ -3497,6 +3497,18 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,
>
> e = Add2Ptr(attr, le16_to_cpu(lrh->attr_off));
>
> + /*
> + * e->view.data_off and dlen come from the on-disk
> + * INDEX_ROOT entry / LRH. The neighbouring read sites
> + * (e.g. fs/ntfs3/index.c) check that
> + * view.data_off + view.data_size <= e->size; mirror that
> + * bound here so the memmove cannot reach past the entry.
> + */
> + if (le16_to_cpu(e->view.data_off) > le16_to_cpu(e->size) ||
> + le16_to_cpu(e->view.data_off) + dlen >
> + le16_to_cpu(e->size))
> + goto dirty_vol;
> +
> memmove(Add2Ptr(e, le16_to_cpu(e->view.data_off)), data, dlen);
>
> mi->dirty = true;
> @@ -3689,6 +3701,12 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,
> goto dirty_vol;
> }
>
> + /* See UpdateRecordDataRoot for the rationale. */
> + if (le16_to_cpu(e->view.data_off) > le16_to_cpu(e->size) ||
> + le16_to_cpu(e->view.data_off) + dlen >
> + le16_to_cpu(e->size))
> + goto dirty_vol;
> +
> memmove(Add2Ptr(e, le16_to_cpu(e->view.data_off)), data, dlen);
>
> a_dirty = true;
Hello,
Your patch was applied, thank you.
Regards,
Konstantin
prev parent reply other threads:[~2026-06-09 7:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-15 16:34 [PATCH] " Michael Bommarito
2026-05-16 4:44 ` Pavitra Jha
2026-05-16 10:00 ` Michael Bommarito
2026-05-19 9:51 ` [PATCH v2] " Michael Bommarito
2026-06-09 7:57 ` Konstantin Komarov [this message]
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=189e7066-3d41-4629-8e9a-deea011047eb@paragon-software.com \
--to=almaz.alexandrovich@paragon-software.com \
--cc=gregkh@linuxfoundation.org \
--cc=jhapavitra98@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.bommarito@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®