From: Viacheslav Dubeyko <slava@dubeyko.com>
To: Bruno Produit <bruno.produit@trailofbits.com>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Yangtao Li <frank.li@vivo.com>
Cc: Kyle Zeng <kylebot@openai.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
Dominik Czarnota <dominik.czarnota@trailofbits.com>,
syzbot+d729df28d933979e017a@syzkaller.appspotmail.com,
syzbot+2eac7d175baf21e6a5d5@syzkaller.appspotmail.com,
syzbot+7155b2fe09e033c91381@syzkaller.appspotmail.com,
syzbot+adeb387cede15eb11607@syzkaller.appspotmail.com,
syzbot+ae7f2423f3648100506d@syzkaller.appspotmail.com
Subject: Re: [PATCH] hfs/hfsplus: serialize B-tree close against folio release
Date: Fri, 18 Sep 2026 12:57:01 -0700 [thread overview]
Message-ID: <5da11ad3c9c7954ad52b04880b61d9cdcdd0211a.camel@dubeyko.com> (raw)
In-Reply-To: <20260918130853.216497-1-bruno.produit@trailofbits.com>
On Fri, 2026-09-18 at 15:08 +0200, Bruno Produit wrote:
> From: Kyle Zeng <kylebot@openai.com>
>
> From: Kyle Zeng <kylebot@openai.com>
Why do we have the same email two times here? :)
>
> B-tree nodes with a zero reference count remain in the node hash
> until
> folio reclaim or tree teardown frees them. The folio release
> callbacks
> remove nodes while holding hash_lock, but hfs_btree_close() walks and
> frees the same hash without that lock. Reclaim can therefore unhash
> and
> free a node after close has loaded its pointer, causing a use-after-
> free
> or double-free.
>
> Detach each node with hfs_bnode_unhash() while holding hash_lock
> before
> inspecting and freeing it. Drop the lock before hfs_bnode_free() so
> a
> large tree is not freed while holding a spinlock. Apply the same fix
> to
> the matching HFS+ implementation.
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
I think we need to have Cc: stable@vger.kernel.org here too.
> Reported-by: syzbot+d729df28d933979e017a@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=d729df28d933979e017a
> Reported-by: syzbot+2eac7d175baf21e6a5d5@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=2eac7d175baf21e6a5d5
> Reported-by: syzbot+7155b2fe09e033c91381@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=7155b2fe09e033c91381
> Reported-by: syzbot+adeb387cede15eb11607@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=adeb387cede15eb11607
> Reported-by: syzbot+ae7f2423f3648100506d@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=ae7f2423f3648100506d
Does this fix really eliminates these reported issues? Have you tested
all of these cases? It will be great to have this clarification in the
commit message.
> Assisted-by: Codex:gpt-5.6-sol
> Signed-off-by: Kyle Zeng <kylebot@openai.com>
> Signed-off-by: Bruno Produit <bruno.produit@trailofbits.com>
> ---
> fs/hfs/btree.c | 11 ++++++++---
> fs/hfsplus/btree.c | 11 ++++++++---
> 2 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
> index 41b4e8fc9..d85a1df9f 100644
> --- a/fs/hfs/btree.c
> +++ b/fs/hfs/btree.c
> @@ -310,14 +310,19 @@ void hfs_btree_close(struct hfs_btree *tree)
> return;
>
> for (i = 0; i < NODE_HASH_SIZE; i++) {
> - while ((node = tree->node_hash[i])) {
> - tree->node_hash[i] = node->next_hash;
> + for (;;) {
I really dislike this infinite loop pattern. Could we have a loop is
limited by some value?
> + spin_lock(&tree->hash_lock);
> + node = tree->node_hash[i];
> + if (node)
> + hfs_bnode_unhash(node);
> + spin_unlock(&tree->hash_lock);
> + if (!node)
> + break;
> if (atomic_read(&node->refcnt))
> pr_err("node %d:%d still has %d
> user(s)!\n",
> node->tree->cnid, node->this,
> atomic_read(&node->refcnt));
> hfs_bnode_free(node);
> - tree->node_hash_cnt--;
> }
> }
> iput(tree->inode);
> diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c
> index 2ea8cd565..a90c9f416 100644
> --- a/fs/hfsplus/btree.c
> +++ b/fs/hfsplus/btree.c
> @@ -417,15 +417,20 @@ void hfs_btree_close(struct hfs_btree *tree)
> return;
>
> for (i = 0; i < NODE_HASH_SIZE; i++) {
> - while ((node = tree->node_hash[i])) {
> - tree->node_hash[i] = node->next_hash;
> + for (;;) {
Ditto.
Thanks,
Slava.
> + spin_lock(&tree->hash_lock);
> + node = tree->node_hash[i];
> + if (node)
> + hfs_bnode_unhash(node);
> + spin_unlock(&tree->hash_lock);
> + if (!node)
> + break;
> if (atomic_read(&node->refcnt))
> pr_crit("node %d:%d "
> "still has %d
> user(s)!\n",
> node->tree->cnid, node-
> >this,
> atomic_read(&node->refcnt));
> hfs_bnode_free(node);
> - tree->node_hash_cnt--;
> }
> }
> iput(tree->inode);
next prev parent reply other threads:[~2026-09-18 19:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-18 13:08 Bruno Produit
2026-09-18 19:57 ` Viacheslav Dubeyko [this message]
2026-09-21 14:29 ` Bruno Produit
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=5da11ad3c9c7954ad52b04880b61d9cdcdd0211a.camel@dubeyko.com \
--to=slava@dubeyko.com \
--cc=bruno.produit@trailofbits.com \
--cc=dominik.czarnota@trailofbits.com \
--cc=frank.li@vivo.com \
--cc=glaubitz@physik.fu-berlin.de \
--cc=kylebot@openai.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syzbot+2eac7d175baf21e6a5d5@syzkaller.appspotmail.com \
--cc=syzbot+7155b2fe09e033c91381@syzkaller.appspotmail.com \
--cc=syzbot+adeb387cede15eb11607@syzkaller.appspotmail.com \
--cc=syzbot+ae7f2423f3648100506d@syzkaller.appspotmail.com \
--cc=syzbot+d729df28d933979e017a@syzkaller.appspotmail.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®