From: Jori Koolstra <jkoolstra@xs4all.nl>
To: Christian Brauner <brauner@kernel.org>,
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>,
Taotao Chen <chentaotao@didiglobal.com>,
Jeff Layton <jlayton@kernel.org>, Jan Kara <jack@suse.cz>,
NeilBrown <neil@brown.name>
Cc: jkoolstra@xs4all.nl, linux-kernel@vger.kernel.org,
syzbot+a65e824272c5f741247d@syzkaller.appspotmail.com
Subject: [PATCH 3/3] Fix a drop_nlink warning in minix_rename
Date: Tue, 4 Nov 2025 15:30:05 +0100 [thread overview]
Message-ID: <20251104143005.3283980-4-jkoolstra@xs4all.nl> (raw)
In-Reply-To: <20251104143005.3283980-1-jkoolstra@xs4all.nl>
Syzbot found a drop_nlink warning that is triggered by an easy to
detect nlink corruption. This patch adds sanity checks to minix_unlink
and minix_rename to prevent the warning and instead return EFSCORRUPTED
to the caller.
The changes were tested using the syzbot reproducer as well as local
testing.
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
Reported-by: syzbot+a65e824272c5f741247d@syzkaller.appspotmail.com
Closes: https://syzbot.org/bug?extid=a65e824272c5f741247d
---
fs/minix/namei.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 68d2dd75b97f..263e4ba8b1c8 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -145,6 +145,11 @@ static int minix_unlink(struct inode * dir, struct dentry *dentry)
struct minix_dir_entry * de;
int err;
+ if (inode->i_nlink == 0) {
+ minix_error_inode(inode, "inode has corrupted nlink");
+ return -EFSCORRUPTED;
+ }
+
de = minix_find_entry(dentry, &folio);
if (!de)
return -ENOENT;
@@ -217,6 +222,17 @@ static int minix_rename(struct mnt_idmap *idmap,
if (dir_de && !minix_empty_dir(new_inode))
goto out_dir;
+ err = -EFSCORRUPTED;
+ if (new_inode->i_nlink == 0 || (dir_de && new_inode->i_nlink != 2)) {
+ minix_error_inode(new_inode, "inode has corrupted nlink");
+ goto out_dir;
+ }
+
+ if (dir_de && old_dir->i_nlink <= 2) {
+ minix_error_inode(old_dir, "inode has corrupted nlink");
+ goto out_dir;
+ }
+
err = -ENOENT;
new_de = minix_find_entry(new_dentry, &new_folio);
if (!new_de)
--
2.51.2
next prev parent reply other threads:[~2025-11-04 14:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-04 14:30 [PATCH 0/3] Fix two syzbot corruption bugs in minix filesystem Jori Koolstra
2025-11-04 14:30 ` [PATCH 1/3] Add error handling to minix filesystem for inode corruption detection Jori Koolstra
2025-11-04 14:30 ` [PATCH 2/3] Fix a drop_nlink warning in minix_rmdir Jori Koolstra
2025-11-04 14:30 ` Jori Koolstra [this message]
2025-11-04 14:50 ` [PATCH 0/3] Fix two syzbot corruption bugs in minix filesystem Jan Kara
2025-11-05 12:45 ` Christian Brauner
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=20251104143005.3283980-4-jkoolstra@xs4all.nl \
--to=jkoolstra@xs4all.nl \
--cc=brauner@kernel.org \
--cc=chentaotao@didiglobal.com \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neil@brown.name \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=syzbot+a65e824272c5f741247d@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®