From nobody Fri Dec 19 09:32:33 2025 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E77132ED3C for ; Tue, 4 Nov 2025 14:30:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762266625; cv=none; b=rBsBGNT/7f79+7LS8X5+vbs7MRGuhCuFf1lEWZTBsKi0sz/2RYhmU1z8qmUFZpKOH3KcWpEB/LjegtK4suOh3t7MjOZxtoGmUhkACLR1uKgKJb13w8wAJOdCnXphmHz+dqTQ8vtLeVr/ZgKVcmGPSOVvsKkT3HRBG+AcdnWHTaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762266625; c=relaxed/simple; bh=Gim/7ab8Ps8c288C2FI2mEQ1eaYsaH0pDWPy3VZlBgU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aAZSkXXmHmHMoNgsK1Spj9AEwzfyvkINnl0dWUs0KN1ZxLeorJIxQ5WhbDiU2zP7+BkUMVfIdLOCH0+fxiUENt7BWAAPnsT44KOGhnIjxLmPIID5YBMEcPl90+LpRFmEkYqv5dfUHxwyfpDttXjKw0ofeH+tBJuo4zNkoHpts/M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=KJjC502c; arc=none smtp.client-ip=195.121.94.185 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="KJjC502c" X-KPN-MessageId: c9295e83-b98a-11f0-ad1a-005056999439 Received: from smtp.kpnmail.nl (unknown [10.31.155.8]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id c9295e83-b98a-11f0-ad1a-005056999439; Tue, 04 Nov 2025 15:30:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=D3xeqw/dfEIrVeGKh37I3luTw6enqPX65TtleKpnD1A=; b=KJjC502cER0Ii2sJ4BldIcJZ/j7F0XbvxYVptX5mHKXBnkOBj03NBPv8R1AVLKsAN1a1zpJsSOFsA 5gHG+9K7DET5acqYOXWRzqDP0g8AguMm/fVa3IVX0HE5JCaEvTyJHr5Kfticxxi+jXtORixVjTqb9t dC5a6rmucLn/IGV0+svSB8EueNjChqRU/VURdDsq6J7Dowru/Bt5XIcqHndzPxRf4O7+MRTNSULaj9 lBtPWVPkYIC5nIcyw83l1Tk+AGZ34BQFhjSd31Or+op7HBC9JNBV8v2nNU1SvT8O+juRrwSlaTTLv9 WS2Rm9nEPGJiLJlnRvAmq7wffMT1MOg== X-KPN-MID: 33|aNPH0QzK0RE3qu1XJXi7PG+3Ef1mEc/+LE0/zF1r8KHYpKJSoN1nFABjbtk/lLA b8+a/SaXX7rllaq7LeCJKqyq/xkxW/LunuaW+K0UTvgg= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|A1japG/uqVWdUlER6TfUx40HlQjRePt8PtemcbvKi7GH6oXw5qi5sHk8x1sw7sO 6tBOYphBKIIexkj1mErvokQ== Received: from daedalus.home (unknown [178.231.9.53]) by smtp.xs4all.nl (Halon) with ESMTPSA id c77a76e8-b98a-11f0-9bf6-00505699d6e5; Tue, 04 Nov 2025 15:30:15 +0100 (CET) From: Jori Koolstra To: Christian Brauner , Tetsuo Handa , Taotao Chen , Jeff Layton , Jan Kara , NeilBrown Cc: jkoolstra@xs4all.nl, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] Add error handling to minix filesystem for inode corruption detection Date: Tue, 4 Nov 2025 15:30:03 +0100 Message-ID: <20251104143005.3283980-2-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251104143005.3283980-1-jkoolstra@xs4all.nl> References: <20251104143005.3283980-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We would like to provide early and specific warnings of filesystem corruption without running into generic WARN_ONs and BUG_ONs. Towards this goal, ext4, e.g., has a EFSCORRUPTED errno and a standardized inode corruption message format. This patch adds this errno and message format to the minix filesystem. Signed-off-by: Jori Koolstra Reviewed-by: Jan Kara --- fs/minix/inode.c | 16 ++++++++++++++++ fs/minix/minix.h | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 32db676127a9..7897f5123b3d 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -26,6 +26,22 @@ static int minix_write_inode(struct inode *inode, struct writeback_control *wbc); static int minix_statfs(struct dentry *dentry, struct kstatfs *buf); =20 +void __minix_error_inode(struct inode *inode, const char *function, + unsigned int line, const char *fmt, ...) +{ + struct va_format vaf; + va_list args; + + va_start(args, fmt); + vaf.fmt =3D fmt; + vaf.va =3D &args; + printk(KERN_CRIT "minix-fs error (device %s): %s:%d: " + "inode #%lu: comm %s: %pV\n", + inode->i_sb->s_id, function, line, inode->i_ino, + current->comm, &vaf); + va_end(args); +} + static void minix_evict_inode(struct inode *inode) { truncate_inode_pages_final(&inode->i_data); diff --git a/fs/minix/minix.h b/fs/minix/minix.h index d54273c3c9ff..2bfaf377f208 100644 --- a/fs/minix/minix.h +++ b/fs/minix/minix.h @@ -42,6 +42,9 @@ struct minix_sb_info { unsigned short s_version; }; =20 +void __minix_error_inode(struct inode *inode, const char *function, + unsigned int line, const char *fmt, ...); + struct inode *minix_iget(struct super_block *, unsigned long); struct minix_inode *minix_V1_raw_inode(struct super_block *, ino_t, struct= buffer_head **); struct minix2_inode *minix_V2_raw_inode(struct super_block *, ino_t, struc= t buffer_head **); @@ -168,4 +171,10 @@ static inline int minix_test_bit(int nr, const void *v= addr) =20 #endif =20 +#define minix_error_inode(inode, fmt, ...) \ + __minix_error_inode((inode), __func__, __LINE__, \ + (fmt), ##__VA_ARGS__) + +#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ + #endif /* FS_MINIX_H */ --=20 2.51.2 From nobody Fri Dec 19 09:32:33 2025 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6301F32D0F4 for ; Tue, 4 Nov 2025 14:30:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762266630; cv=none; b=mZmFhBOFeZm8dV4xsEXHBaSwKlVP9/RquwJOCA7X0T4JaCogek+A0UGcYB+c8C61BY9ToJ1vmndJVVcIvj9J+DYz1nooaDYr7KNI+M74gIcmilB8ZhpKQmTrSkmpqn5ESR0WZccGdPYnMTXp9GXjBkUN45QPRXxhAGoKTqAyibA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762266630; c=relaxed/simple; bh=OP/vV9wqkkrZmtHacKwbnTGp3xOKKezFJ+9b9Cjdg/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H0UEPbzZUl+oqf+DWK1K7hVaE6VpNg+qUfqeVLKw7umLzHk18s192ZnVbFd5oGcyo3nZluePUOp759gByEs+1sngSs4UZy+55USczapm7aT4UPVfYdji7UY7mXXZLPfPcAkqCqvA4IXdfx4z6dsRe1eyzpjEzpitaYgfbrmjEyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=aiPQnTb7; arc=none smtp.client-ip=195.121.94.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="aiPQnTb7" X-KPN-MessageId: eab9c498-b98a-11f0-809d-005056992ed3 Received: from smtp.kpnmail.nl (unknown [10.31.155.8]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id eab9c498-b98a-11f0-809d-005056992ed3; Tue, 04 Nov 2025 15:31:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=+ZKlco8b941O2c9jwUmj589LwJx/2en+qb021fex3xE=; b=aiPQnTb7VzHLq74S32z7Q2AldsZzzoGS6dP2Y8URAgcwyAYQma+Dbom63zfT6QyuUrwnPnKD92Toh NlZVYEL3C2XqMm4y5fQB61G6QqAy0onWfRxnjI0VCBHJgVTakCaDgNdR+nfdSn5bKs5y1vMQddIl9D N9HyBKbKXiMHgURhbPkL4Z8YfAS1vQc4DSbjK1NSRhJyAxQZAqXV4T1gRzopbjXpRJ87hkTr3/j8ON GuR8yRcrU5BRf04bYaQ1wnuUtmUUy5qs9IBBtDtjhearq0pP0x6ISpG7cVyux85CzexFjzHE3RD83a SA+ITUgSm84cYjt4VHBHI2Mq84Rkx9g== X-KPN-MID: 33|AOaL8jm0SiiuMMg+0+xfpXAtOKzEkwPEnj3JRzFsAH6/I66dYDC4+AxBe2MaQA1 0UzPpEzIsfa4OWjC7MtLK73X98dKLOfKPe2W1X+nofxU= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|BqbPRmFOI0l2ebBuKRx97+PRYKU2tbpj7pFMPmkSh9Az2qKDuui3EqJNmgNmLR5 W4owWilwTjclzc9KYLobyMQ== Received: from daedalus.home (unknown [178.231.9.53]) by smtp.xs4all.nl (Halon) with ESMTPSA id cb7d9580-b98a-11f0-9bf6-00505699d6e5; Tue, 04 Nov 2025 15:30:22 +0100 (CET) From: Jori Koolstra To: Christian Brauner , Tetsuo Handa , Taotao Chen , Jeff Layton , Jan Kara , NeilBrown Cc: jkoolstra@xs4all.nl, linux-kernel@vger.kernel.org, syzbot+4e49728ec1cbaf3b91d2@syzkaller.appspotmail.com Subject: [PATCH 2/3] Fix a drop_nlink warning in minix_rmdir Date: Tue, 4 Nov 2025 15:30:04 +0100 Message-ID: <20251104143005.3283980-3-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251104143005.3283980-1-jkoolstra@xs4all.nl> References: <20251104143005.3283980-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Syzbot found a drop_nlink warning that is triggered by an easy to detect nlink corruption of a directory. This patch adds a sanity check to minix_rmdir 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 Reported-by: syzbot+4e49728ec1cbaf3b91d2@syzkaller.appspotmail.com Closes: https://syzbot.org/bug?extid=3D4e49728ec1cbaf3b91d2 Reviewed-by: Jan Kara --- fs/minix/namei.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/fs/minix/namei.c b/fs/minix/namei.c index 8938536d8d3c..68d2dd75b97f 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -161,15 +161,24 @@ static int minix_unlink(struct inode * dir, struct de= ntry *dentry) static int minix_rmdir(struct inode * dir, struct dentry *dentry) { struct inode * inode =3D d_inode(dentry); - int err =3D -ENOTEMPTY; - - if (minix_empty_dir(inode)) { - err =3D minix_unlink(dir, dentry); - if (!err) { - inode_dec_link_count(dir); - inode_dec_link_count(inode); - } + int err =3D -EFSCORRUPTED; + + if (dir->i_nlink <=3D 2) { + minix_error_inode(dir, "inode has corrupted nlink"); + goto out; + } + + err =3D -ENOTEMPTY; + if (!minix_empty_dir(inode)) + goto out; + + err =3D minix_unlink(dir, dentry); + if (!err) { + inode_dec_link_count(dir); + inode_dec_link_count(inode); } + +out: return err; } =20 --=20 2.51.2 From nobody Fri Dec 19 09:32:33 2025 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 740A83314A0 for ; Tue, 4 Nov 2025 14:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762266633; cv=none; b=pe0h/S2iLHQiH//HquXQ6FWZ1kE9OWi4N9jiJEI3BYNTMbTq+5t/sZq4IPTjdTqIrm1+B7YfBMczTH2uhOwiOHze1OTnUFRfN7y2xVjmovXV0BCRU1M3RUolFSwHaa9Ymshy40VaeNf10V/6b3jKBB72ZdkOhVJ4phT+Rdjri60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762266633; c=relaxed/simple; bh=IL2nrGlEqs3K32c6TMpRLuNQm6KKha/RXLuIUi5rJsI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jZuOMjhNmuqwHHdV1xByJ/B9IvY9sGI51tgzJKP/0JrJfh8RmCMMVXGecquRmMoy3jtBUfLZag2SY9MSQIC67M3V2/13AIqlWFGPmpP6NNGHTR/pjWIvwcNQ4brtSQEsqtfhynGOTYc1N4l/XgGr+J3UL0SDaHEvGzgmvpPoQWA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=saCyWy/s; arc=none smtp.client-ip=195.121.94.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="saCyWy/s" X-KPN-MessageId: eb973a6d-b98a-11f0-809d-005056992ed3 Received: from smtp.kpnmail.nl (unknown [10.31.155.8]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id eb973a6d-b98a-11f0-809d-005056992ed3; Tue, 04 Nov 2025 15:31:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=So3V6E2kJy5zkPbcq4XrBxevV+PIGfWxZmUHoE1an4I=; b=saCyWy/stXYI35VSyKCaQCtFtE+OFlFekLrswaqhuTz+DwF3gkgFRH1wXgKm0RCN1wIJv6FGUtQWD DC7hSJnuwHw0QKMJ3hiG1mwwRjWx1PUb8NCsfs/v//xi1/VIB94BZg4LEK9PN2Ehy60Rb+/fup+NVS iLxWQkrfhnabwPJTPxq9cPyr9RkzweW3mECIusZtJqkR3Bo9iKixDTtIPsCQvGCaxTW563kUaN0wW0 ReDaJ88KvVbRQmtg2Z09OnV1fyvVzpMSVz0YJ4VC48CxK9La0tz05z8geuTrq1gCZKIi8XPG/zbym4 w5SCXk8GM78zX1Hnlch97Rz8AmkXp2g== X-KPN-MID: 33|T0nD5WN8WsynbF9UJ6sQxGlWSXykxTaW+9Odhmv6jUxAOcFVwOnrfSunCM/EPqt ND2O8n17gEcQHrUl6Pw2fkAsxCsFca5O/dmqNuc2nvUI= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|6GV+mNOx4esihGkMDcJdfZgD7UFh9x1J3SNjl027vj0XaFwqJsL1h51tHzwkVL9 xcaqxRzwXKkEOvt7+pZvjaA== Received: from daedalus.home (unknown [178.231.9.53]) by smtp.xs4all.nl (Halon) with ESMTPSA id cc594538-b98a-11f0-9bf6-00505699d6e5; Tue, 04 Nov 2025 15:30:23 +0100 (CET) From: Jori Koolstra To: Christian Brauner , Tetsuo Handa , Taotao Chen , Jeff Layton , Jan Kara , NeilBrown 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 Message-ID: <20251104143005.3283980-4-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251104143005.3283980-1-jkoolstra@xs4all.nl> References: <20251104143005.3283980-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reported-by: syzbot+a65e824272c5f741247d@syzkaller.appspotmail.com Closes: https://syzbot.org/bug?extid=3Da65e824272c5f741247d Reviewed-by: Jan Kara --- 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 den= try *dentry) struct minix_dir_entry * de; int err; =20 + if (inode->i_nlink =3D=3D 0) { + minix_error_inode(inode, "inode has corrupted nlink"); + return -EFSCORRUPTED; + } + de =3D 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; =20 + err =3D -EFSCORRUPTED; + if (new_inode->i_nlink =3D=3D 0 || (dir_de && new_inode->i_nlink !=3D 2)= ) { + minix_error_inode(new_inode, "inode has corrupted nlink"); + goto out_dir; + } + + if (dir_de && old_dir->i_nlink <=3D 2) { + minix_error_inode(old_dir, "inode has corrupted nlink"); + goto out_dir; + } + err =3D -ENOENT; new_de =3D minix_find_entry(new_dentry, &new_folio); if (!new_de) --=20 2.51.2