From nobody Sat Sep 17 09:11:39 2022 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 4MV4tz46m7z4c3vW; Sat, 17 Sep 2022 09:11:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MV4tz3VdXz3h06; Sat, 17 Sep 2022 09:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663405899; 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=bXUQ8sugRZjjnIrvq1VdJVPUK3r8ADge++ziUWXUoAY=; b=elRJen+21/GVPH6a6Xyfk1DbQr6SyJ6GOaeoBv58SBGy8AQdv+WJmI8Pmj2sPhjqKs9HrW On73YKggDjAK0H1frmfiuRrJD+4nyPx3/QzroMFc+jvGj5KcgobVEXuYveUE8ujGR+7Dfn s09nKAi+5TKz80YkemzaDQbO90zJw1Umw0GXdDI3AdufK0BbW+IjJiu7qxTtIeBsFqDCT2 dOaxpON1hyjHtOM43yEY6iP82issOcgIkgiAklTTFBSAF3LdNHokGCLaQb7azXdtXAHnaX wp1t1fx7+c3Ekolh+5Hv2y0Ur7yq40WKXz+bNANsCUqeKUBgFMz/wQkXbWDJYQ== 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 4MV4tz2S0dzfnW; Sat, 17 Sep 2022 09:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28H9BduN085219; Sat, 17 Sep 2022 09:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28H9Bd7O085218; Sat, 17 Sep 2022 09:11:39 GMT (envelope-from git) Date: Sat, 17 Sep 2022 09:11:39 GMT Message-Id: <202209170911.28H9Bd7O085218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 41a0a99f855f - main - vfs: slightly reorganize error handling in chroot 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41a0a99f855fd28ec2a73685bea0fdcfaddaa4d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663405899; 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=bXUQ8sugRZjjnIrvq1VdJVPUK3r8ADge++ziUWXUoAY=; b=yUKnD3r5eldQgJqkVnK/QO0EBK05+G5WAJv6nXNiWuWv4zmj0M8MnwwBhkYNDFKTlQwBoF 32NQLMagq4gFASwb7bT4bwq70zFtbMYcvw4TV4iqIe4Bdn5BDz4RI95h2VaZOm3pQomDyr 4HnURMsJDJemVutkFphjdpu1f3qa2/ues/fZnlKxY4wMe5KLt5qpB9m5IddyJvLk0Yy+av hlTr7WBkxCyVzxgHDj5plh41ulZawgw6ZhKFtrv6Hbm7piuYkIrdmnd30p9xJcE599MKi3 sbCUuIAt/GN8znJo1f2811rM7/WeFcs8qKI+vEVgcc1Z3vksZp5oXdLr/Z4oqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663405899; a=rsa-sha256; cv=none; b=SQJvyC+oUyMfld26WiD2GgESTrBc7cYSajkKi67S0g4zgBnNNZt1ePc5P/seREaiwuB89l 7PXpUfEG2YgYlOrvb6egzVQ4/0jmvI+K44t9ut3vJTY1RCct7TF52TVX7qwy75sWd6HtUH DcfznUlbOo+j2/0hTwtgZ0uSCCriqPcfzpowMDAbZOGnnRIOh5CJDTeRrJ5bEEsSw2JhUV r4FmmVvmnnh8AFgqX/JKmnm8A3HXUr8hVMzdHjG3INzf+eZ4x4PC4gQMnHRLkr4y7bhWVF hUJ9nQmoxEX+rG/mIE0VbwqAGe+EvYjiMUjE/NGubpAk0BVDWKCqPiiXhuf3vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=41a0a99f855fd28ec2a73685bea0fdcfaddaa4d6 commit 41a0a99f855fd28ec2a73685bea0fdcfaddaa4d6 Author: Mateusz Guzik AuthorDate: 2022-09-17 01:19:42 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-17 09:08:34 +0000 vfs: slightly reorganize error handling in chroot This avoids duplicated NDFREE_NOTHING which will be of importance later. --- sys/kern/vfs_syscalls.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 85f85c5f1a99..006ee24cac25 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1000,7 +1000,8 @@ sys_chroot(struct thread *td, struct chroot_args *uap) UIO_USERSPACE, uap->path); error = namei(&nd); if (error != 0) - goto error; + return (error); + NDFREE_NOTHING(&nd); error = change_dir(nd.ni_vp, td); if (error != 0) goto e_vunlock; @@ -1012,12 +1013,9 @@ sys_chroot(struct thread *td, struct chroot_args *uap) VOP_UNLOCK(nd.ni_vp); error = pwd_chroot(td, nd.ni_vp); vrele(nd.ni_vp); - NDFREE_NOTHING(&nd); return (error); e_vunlock: vput(nd.ni_vp); -error: - NDFREE_NOTHING(&nd); return (error); }