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

MFC 1.157:

Browse Source 
Keep locks consistent before goto.

  Reported by:    pho
  Reviewed by:    mohans
This commit is contained in:
glebius 2005-11-25 14:32:38 +00:00
parent d60eb7f43e
commit 3da94ed211
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/nfsserver/nfs_serv.c
View File

@ -2092,6 +2092,8 @@ nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED);
vtyp = nfsv3tov_type(*tl);
if (vtyp != VCHR && vtyp != VBLK && vtyp != VSOCK && vtyp != VFIFO) {
NFSD_UNLOCK();
mtx_lock(&Giant); /* VFS */
error = NFSERR_BADTYPE;
goto out;
}
@ -2108,6 +2110,8 @@ nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
* Iff doesn't exist, create it.
*/
if (nd.ni_vp) {
NFSD_UNLOCK();
mtx_lock(&Giant); /* VFS */
error = EEXIST;
goto out;
}