From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
To: Yun Zhou <yun.zhou@windriver.com>
Cc: <ntfs3@lists.linux.dev>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] ntfs3: release ni_lock before dir_emit in ntfs_readdir to fix deadlocks
Date: Fri, 16 Oct 2026 16:48:32 +0200 [thread overview]
Message-ID: <d3279695-9c86-44c8-870d-dd71393a68ff@paragon-software.com> (raw)
In-Reply-To: <20260701013049.3141386-3-yun.zhou@windriver.com>
On 7/1/26 03:30, Yun Zhou wrote:
> ntfs_readdir() holds ni_lock while calling ntfs_read_hdr(), which calls
> dir_emit() to copy directory entries to userspace. If the user buffer
> triggers a page fault, the fault handler may need mmap_lock or
> mapping->invalidate_lock, creating lock-order inversions with paths
> that acquire those locks before ni_lock (e.g. ntfs_fallocate, mmap).
>
> Fix by releasing ni_lock before calling ntfs_read_hdr():
>
> - For non-root index nodes, indx_read_ra() returns data in a kmalloc'd
> buffer (node->index) that remains valid after ni_unlock.
>
> - For the root index header, the data lives in the main MFT record
> whose lifetime is bound to the inode. i_rwsem shared prevents
> concurrent directory modifications, so it is safe to access after
> ni_unlock.
>
> Reported-by: syzbot+7736960b837908f3a81d@syzkaller.appspotmail.com
> Reported-by: syzbot+262a71e9d2faf8747085@syzkaller.appspotmail.com
> Reported-by: syzbot+cfc6e8106bec1c524f7d@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=7736960b837908f3a81d
> Closes: https://syzkaller.appspot.com/bug?extid=262a71e9d2faf8747085
> Closes: https://syzkaller.appspot.com/bug?extid=cfc6e8106bec1c524f7d
> Fixes: d62cf685d12e ("fs/ntfs3: hold ni_lock across readdir metadata walk")
> Signed-off-by: Yun Zhou <yun.zhou@windriver.com>
> ---
> fs/ntfs3/dir.c | 22 ++++++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c
> index 07de564a2c47..65883409689a 100644
> --- a/fs/ntfs3/dir.c
> +++ b/fs/ntfs3/dir.c
> @@ -491,12 +491,22 @@ static int ntfs_readdir(struct file *file, struct dir_context *ctx)
> if (pos >= sbi->record_size) {
> bit = (pos - sbi->record_size) >> index_bits;
> } else {
> + /*
> + * Release ni_lock before dir_emit (which may fault into
> + * user pages). root->ihdr lives in the main MFT record
> + * whose lifetime is bound to the inode, and i_rwsem shared
> + * prevents concurrent directory modifications.
> + */
> + ni_unlock(ni);
> +
> /*
> * Add each name from root in 'ctx'.
> */
> err = ntfs_read_hdr(sbi, ni, &root->ihdr, 0, pos, name, ctx);
> if (err)
> - goto out_unlock;
> + goto out;
> +
> + ni_lock(ni);
> bit = 0;
> }
>
> @@ -525,6 +535,12 @@ static int ntfs_readdir(struct file *file, struct dir_context *ctx)
> if (err)
> goto out_unlock;
>
> + /*
> + * node->index is a kmalloc'd buffer, safe after ni_unlock.
> + * Release lock before dir_emit to avoid lock-order issues.
> + */
> + ni_unlock(ni);
> +
> /*
> * Add each name from index in 'ctx'.
> */
> @@ -532,7 +548,9 @@ static int ntfs_readdir(struct file *file, struct dir_context *ctx)
> ((u64)bit << index_bits) + sbi->record_size,
> pos, name, ctx);
> if (err)
> - goto out_unlock;
> + goto out;
> +
> + ni_lock(ni);
> }
>
> out_unlock:
Hello,
The patch was applied, thanks.
Regards,
Konstantin
next prev parent reply other threads:[~2026-10-16 14:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 1:30 [PATCH 0/2] ntfs3: fix deadlocks in ntfs_readdir caused by ni_lock held across dir_emit Yun Zhou
2026-07-01 1:30 ` [PATCH 1/2] ntfs3: remove ntfs_iget5 call in ntfs_dir_emit to fix recursive deadlock Yun Zhou
2026-07-01 1:30 ` [PATCH 2/2] ntfs3: release ni_lock before dir_emit in ntfs_readdir to fix deadlocks Yun Zhou
2026-10-16 14:48 ` Konstantin Komarov [this message]
2026-07-19 12:29 ` [PATCH 0/2] ntfs3: fix deadlocks in ntfs_readdir caused by ni_lock held across dir_emit Zhou, Yun
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=d3279695-9c86-44c8-870d-dd71393a68ff@paragon-software.com \
--to=almaz.alexandrovich@paragon-software.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=yun.zhou@windriver.com \
/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®