The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2bc355c0182a889acc97a09e1272f7d7593949af
commit 2bc355c0182a889acc97a09e1272f7d7593949af
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-07-29 13:56:48 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-07-29 13:56:48 +0000
ufs: Pass the new parent inode number to ufs_dirrewrite()
Despite the name, isrmdir is not a boolean-valued, it is also used to
pass a new parent inode number down to the SU layer.
Fixes: 98eb6f0eaa50 ("ufs: restore conditional")
Reviewed by: kib
Reported by: syzbot+fbfff9613b6dab616...@syzkaller.appspotmail.com
Reported by: syzbot+02cb048d48b51bcd9...@syzkaller.appspotmail.com
Reported by: syzbot+98c39c45a437812f7...@syzkaller.appspotmail.com
Reported by: syzbot+6fb8cb919cc686d1a...@syzkaller.appspotmail.com
Reported by: syzbot+fb35cce6a6f5075a6...@syzkaller.appspotmail.com
Reported by: syzbot+602fb6ee1a39abfd3...@syzkaller.appspotmail.com
Reported by: syzbot+5cb82352555d5d505...@syzkaller.appspotmail.com
Reported by: syzbot+6a4ea1e13f4e07369...@syzkaller.appspotmail.com
Reported by: syzbot+18722c8e4008048ef...@syzkaller.appspotmail.com
---
sys/ufs/ufs/ufs_vnops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 050b21c2be0b..b7453db9013c 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1643,7 +1643,7 @@ relock:
}
error = ufs_dirrewrite(tdp, tip, fip->i_number,
IFTODT(fip->i_mode), (doingdirectory && newparent != 0) ?
- newparent != 0: doingdirectory);
+ newparent : doingdirectory);
if (error) {
if (doingdirectory) {
if (newparent == 0) {
