d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: slightly reorganize error handling in chroot

Browse Source 
This avoids duplicated NDFREE_NOTHING which will be of importance
later.
This commit is contained in:
Mateusz Guzik 2022-09-17 01:19:42 +00:00
parent 55c5216582
commit 41a0a99f85
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/vfs_syscalls.c
View File

@ -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);
}