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

useracc() is mpsafe so we only need to hold Giant

Browse Source 
over the call to nanosleep1()

Pointed out by: tjr
This commit is contained in:
Alfred Perlstein 2003-01-19 06:51:10 +00:00
parent 9d683ffd4b
commit 31f3e2ad8e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/kern_time.c
View File

@ -293,24 +293,19 @@ nanosleep(struct thread *td, struct nanosleep_args *uap)
if (error)
return (error);
if (uap->rmtp &&
!useracc((caddr_t)uap->rmtp, sizeof(rmt), VM_PROT_WRITE))
return (EFAULT);
mtx_lock(&Giant);
if (uap->rmtp) {
if (!useracc((caddr_t)uap->rmtp, sizeof(rmt),
VM_PROT_WRITE)) {
error = EFAULT;
goto done2;
}
}
error = nanosleep1(td, &rqt, &rmt);
mtx_unlock(&Giant);
if (error && uap->rmtp) {
int error2;
error2 = copyout(&rmt, uap->rmtp, sizeof(rmt));
if (error2) /* XXX shouldn't happen, did useracc() above */
if (error2)
error = error2;
}
done2:
mtx_unlock(&Giant);
return (error);
}