From: Lizhi Xu <lizhi.xu@windriver.com>
To: <syzbot+9bff4c7b992038a7409f@syzkaller.appspotmail.com>
Cc: <konishi.ryusuke@gmail.com>, <linux-kernel@vger.kernel.org>,
<linux-nilfs@vger.kernel.org>, <syzkaller-bugs@googlegroups.com>
Subject: Re: [syzbot] [nilfs?] general protection fault in nilfs_btree_insert (2)
Date: Mon, 2 Sep 2024 16:41:01 +0800 [thread overview]
Message-ID: <20240902084101.138971-1-lizhi.xu@windriver.com> (raw)
In-Reply-To: <000000000000b4cf9a062114d132@google.com>
In nilfs_btree_do_lookup, if the number of children in the btree root node is 0,
path[x].bp_bh will not be initialized by __nilfs_btree_get_block,
which will result in uaf when executing nilfs-btree_get_nonroot_node
in nilfs_btree_prepare_insert.
In nilfs_bmap_do_insert will run bop_check_insert, so implement
bop_check_insert and determine the number of children in the btree root
node within it. If it is 0, return a negative value to avoid calling
bop_intsert.
#syz test
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 862bdf23120e..d7fa4d914638 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -1231,6 +1231,17 @@ static void nilfs_btree_commit_insert(struct nilfs_bmap *btree,
nilfs_bmap_set_dirty(btree);
}
+static int nilfs_btree_check_insert(const struct nilfs_bmap *btree, __u64 key)
+{
+ struct nilfs_btree_node *node;
+ int level;
+
+ node = nilfs_btree_get_root(btree);
+ level = nilfs_btree_node_get_level(node);
+ return (level < NILFS_BTREE_LEVEL_NODE_MIN ||
+ nilfs_btree_node_get_nchildren(node) <= 0) ? -ENOENT : 0;
+}
+
static int nilfs_btree_insert(struct nilfs_bmap *btree, __u64 key, __u64 ptr)
{
struct nilfs_btree_path *path;
@@ -2385,7 +2396,7 @@ static const struct nilfs_bmap_operations nilfs_btree_ops = {
.bop_seek_key = nilfs_btree_seek_key,
.bop_last_key = nilfs_btree_last_key,
- .bop_check_insert = NULL,
+ .bop_check_insert = nilfs_btree_check_insert,
.bop_check_delete = nilfs_btree_check_delete,
.bop_gather_data = nilfs_btree_gather_data,
};
next prev parent reply other threads:[~2024-09-02 9:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-01 20:39 [syzbot] [nilfs?] general protection fault in nilfs_btree_insert (2) syzbot
2024-09-02 8:41 ` Lizhi Xu [this message]
2024-09-02 10:08 ` syzbot
2024-09-02 19:40 ` Ryusuke Konishi
2024-09-04 8:13 ` [PATCH 0/3] nilfs2: fix potential issues with empty b-tree nodes Ryusuke Konishi
2024-09-04 8:13 ` [PATCH 1/3] nilfs2: fix potential null-ptr-deref in nilfs_btree_insert() Ryusuke Konishi
2024-09-04 8:13 ` [PATCH 2/3] nilfs2: determine empty node blocks as corrupted Ryusuke Konishi
2024-09-04 8:13 ` [PATCH 3/3] nilfs2: fix potential oob read in nilfs_btree_check_delete() Ryusuke Konishi
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=20240902084101.138971-1-lizhi.xu@windriver.com \
--to=lizhi.xu@windriver.com \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=syzbot+9bff4c7b992038a7409f@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.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;
as well as URLs for NNTP newsgroup(s).