From nobody Tue Jul 29 14:01:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4brxpJ5ywDz631p2; Tue, 29 Jul 2025 14:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brxpJ57H0z3GyJ; Tue, 29 Jul 2025 14:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753797672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAA3FaHy3L3Eo2AYlrvI84v2BaL0W4nlsmLesdq898Y=; b=VRgSqTeIBGzltqvW4qCstin78lAVC/8vtNv9bPCjjlxbM75UZv65w7yH2UwLDVXof2I1N+ GLzjUbwqV65rkEPkouRSRPrfVv88g/RlaIezkLqsD9y9aAWA6eUyHKwyfoVMNLLT+U572/ eMGRsQmkKfk1c3uEsTl+cfLDCI4rkdblJoYtQxDbifkKi9vN+tIOJPp7M9jtM1iAd/ockA viVBZ3MF5E5EIujpSnG/HbqrlX4s/76yHI6lkvqIgachULErXILUSYVq0liuktzoK+DLjN X21kUYA9bD+mQrXInxv7mID3e/UzojtY0MQNLwN5ZBJC+5oeadRaF/I+73OrCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753797672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAA3FaHy3L3Eo2AYlrvI84v2BaL0W4nlsmLesdq898Y=; b=ekuESUwbvXc7d4QajxpY/r0ICOtYTse9qQfhNNtvwU40ePzp5HtaIeexDTkwgoYnKOcikj XfaeKGZtD0uhMtRhPj+1/A3esYXSaqJp9DZ4Sptf8SbmxuRMhk6NMlESXoUCQPrBhzrZ1U 68kDg/h61GYJSbMjwKEIk44pkllpxpZmLlRbEwGR0M23kCZfUAs1dvjbn8u51qR/2u3t6L yn90M/z65EmVWQNeToq9vJtMO85rY1/ib6lCcXqraEFZn8iDjSKoyIp9nUiGWsCApybTOh N+RW4/6K2aGKhqaQf5DgE1zyh5M7ypcPoXzNPU6onyqsM9z+aeNKN0bsggEw6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753797672; a=rsa-sha256; cv=none; b=ZAkadtrqF3AOQIlSVruBkYgzhjCn4KvvNwNwLLusfz/h263oJH+QalnVkx/+kPmlxs5TTz hnlqWLJtlorOypSpQkVb3MGTQo7fygDrg9kRIOEhtgGUSL5b0TlwQVZnGcZs4MOq7tncBC OfbhyazkkKjvNeXgistMxg80epKh0du/DbKL4+nccSyh7jIU+LlNHCAz9lKDpYBHga7u0B +w4yI/9q6Q1afyCJt64LmVjdVWaFGUwvm+gNtHI3dk739YCdxUxzyKiaGclu9uANOnJlDO KmPp0ekOBXBd/l+twcPEuMTfr8xnpcNclXBuffRc4hdg5EFbvFJVxp8LbmjzHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4brxpJ4V6dzbNZ; Tue, 29 Jul 2025 14:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56TE1Cue077725; Tue, 29 Jul 2025 14:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TE1CkO077722; Tue, 29 Jul 2025 14:01:12 GMT (envelope-from git) Date: Tue, 29 Jul 2025 14:01:12 GMT Message-Id: <202507291401.56TE1CkO077722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2bc355c0182a - main - ufs: Pass the new parent inode number to ufs_dirrewrite() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bc355c0182a889acc97a09e1272f7d7593949af Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2bc355c0182a889acc97a09e1272f7d7593949af commit 2bc355c0182a889acc97a09e1272f7d7593949af Author: Mark Johnston AuthorDate: 2025-07-29 13:56:48 +0000 Commit: Mark Johnston 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+fbfff9613b6dab616124@syzkaller.appspotmail.com Reported by: syzbot+02cb048d48b51bcd9c41@syzkaller.appspotmail.com Reported by: syzbot+98c39c45a437812f7683@syzkaller.appspotmail.com Reported by: syzbot+6fb8cb919cc686d1a1d0@syzkaller.appspotmail.com Reported by: syzbot+fb35cce6a6f5075a6692@syzkaller.appspotmail.com Reported by: syzbot+602fb6ee1a39abfd3b5c@syzkaller.appspotmail.com Reported by: syzbot+5cb82352555d5d505640@syzkaller.appspotmail.com Reported by: syzbot+6a4ea1e13f4e07369785@syzkaller.appspotmail.com Reported by: syzbot+18722c8e4008048efb51@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) {