From: 1sh1ro <yangguikun19@qq.com>
To: Viacheslav Dubeyko <slava@dubeyko.com>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Yangtao Li <frank.li@vivo.com>
Cc: 1sh1ro <yangguikun19@qq.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
Mateusz Guzik <mjguzik@gmail.com>,
Christian Brauner <brauner@kernel.org>,
stable@vger.kernel.org
Subject: [PATCH 1/1] hfs: don't let internal B-tree inodes leak into the VFS open path
Date: Wed, 16 Sep 2026 17:09:54 +0800 [thread overview]
Message-ID: <tencent_6BAAD177CBC8B253A2297594808F7D546606@qq.com> (raw)
In-Reply-To: <20260916080000.0-hfs-fix@localhost>
hfs_btree_open() creates the extents and catalog B-tree inodes with
iget_locked() and never assigns them a file type, so both stay cached
with i_mode == 0 after mount.
A crafted HFS image whose catalog contains a record whose DirID/FlNum
aliases HFS_EXT_CNID (3) or HFS_CAT_CNID (4) makes hfs_lookup() ->
hfs_iget() -> iget5_locked() return that already-cached internal inode
(hfs_test_inode() only compares i_ino), without running
hfs_read_inode(). The typeless inode then reaches the generic open
path and, with CONFIG_DEBUG_VFS=y, deterministically panics:
VFS_BUG_ON_INODE(!IS_ANON_FILE(inode)): inode:... fs:hfs mode:0 opflags:0xc flags:0x0 state:0x0 count:2
------------[ cut here ]------------
kernel BUG at fs/namei.c:4271!
RIP: 0010:may_open+0x2ba/0x480 fs/namei.c:4271
Call Trace:
do_open fs/namei.c:4698 [inline]
path_openat+0x1600/0x3de0 fs/namei.c:4863
__x64_sys_openat+0x13f/0x1f0 fs/open.c:1385
Fix it in two steps:
- give the B-tree inodes an S_IFREG type in hfs_btree_open(), so the
"every cached inode has a valid S_IFMT type" VFS invariant holds
regardless of what is on disk;
- refuse, in hfs_iget(), catalog records that address the reserved
B-tree CNIDs so a malformed image cannot alias internal objects
into dentries at all. Returning NULL follows the existing
convention for unaddressable records: hfs_fill_super() turns it
into a mount failure and hfs_lookup() into -EACCES.
Without CONFIG_DEBUG_VFS the assertion compiles away and the same
crafted image silently makes a typeless inode openable, so this is not
merely a debug-config nuisance.
Found by syzkaller-style fuzzing of v7.2-rc7; still reproducible on
current mainline.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: 1sh1ro <yangguikun19@qq.com>
---
fs/hfs/btree.c | 8 ++++++++
fs/hfs/inode.c | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index 2eb37a2f64e8..bd69ace8f309 100644
--- a/fs/hfs/btree.c
+++ b/fs/hfs/btree.c
@@ -43,6 +43,14 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
if (!tree->inode)
goto free_tree;
BUG_ON(!(inode_state_read_once(tree->inode) & I_NEW));
+
+ /* B-tree inodes are internal objects that must never be exposed
+ * through directory entries. Give them a REG type so the VFS
+ * invariant "every cached inode has a valid S_IFMT type" holds even
+ * when a corrupted image contains catalog records aliasing these
+ * reserved CNIDs.
+ */
+ tree->inode->i_mode = S_IFREG;
{
struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
HFS_I(tree->inode)->flags = 0;
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index ac4a9055c5c0..bb759345f1fc 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -432,6 +432,17 @@ struct inode *hfs_iget(struct super_block *sb, struct hfs_cat_key *key, hfs_cat_
default:
return NULL;
}
+
+ /* Refuse catalog records that address the internal B-tree objects:
+ * a crafted image can otherwise make hfs_lookup() return the cached
+ * typeless B-tree inode, which then reaches may_open() with
+ * i_mode == 0 and trips VFS_BUG_ON_INODE() there. NULL follows the
+ * existing convention for unaddressable records (mount failure /
+ * -EACCES).
+ */
+ if (cnid == HFS_EXT_CNID || cnid == HFS_CAT_CNID)
+ return NULL;
+
inode = iget5_locked(sb, cnid, hfs_test_inode, hfs_read_inode, &data);
if (inode && (inode_state_read_once(inode) & I_NEW))
unlock_new_inode(inode);
--
2.39.5
next parent reply other threads:[~2026-09-16 9:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260916080000.0-hfs-fix@localhost>
2026-09-16 9:09 ` 1sh1ro [this message]
2026-09-16 18:33 ` Viacheslav Dubeyko
2026-10-12 7:44 ` [PATCH v2 0/2] hfs: keep the internal B-tree inodes out of " 1sh1ro
[not found] ` <20261012154438.6396-1-yangguikun19@qq.com>
2026-10-12 7:44 ` [PATCH v2 1/2] hfs: create the internal B-tree inodes through the generic iget path 1sh1ro
2026-10-12 21:26 ` Viacheslav Dubeyko
2026-10-12 7:44 ` [PATCH v2 2/2] hfs: refuse catalog records that address the reserved B-tree CNIDs 1sh1ro
2026-10-12 21:30 ` Viacheslav Dubeyko
2026-10-13 6:44 ` [PATCH v3] hfs: give the internal B-tree inodes a type and keep catalog records off them yangguikun
2026-10-13 21:38 ` Viacheslav Dubeyko
2026-10-14 8:03 ` [PATCH v4] hfs: initialize B-tree inodes and validate catalog CNIDs yangguikun
2026-10-14 22:27 ` Viacheslav Dubeyko
2026-10-15 7:06 ` [PATCH v5] " yangguikun
2026-10-15 22:34 ` Viacheslav Dubeyko
2026-10-17 5:14 ` yangguikun
2026-10-19 23:44 ` Viacheslav Dubeyko
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=tencent_6BAAD177CBC8B253A2297594808F7D546606@qq.com \
--to=yangguikun19@qq.com \
--cc=brauner@kernel.org \
--cc=frank.li@vivo.com \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjguzik@gmail.com \
--cc=slava@dubeyko.com \
--cc=stable@vger.kernel.org \
/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®