svn commit: r360225 - in stable/11/sys: compat/freebsd32 kern
Brooks Davis
brooks at FreeBSD.org
Thu Apr 23 17:46:30 UTC 2020
Author: brooks
Date: Thu Apr 23 17:46:29 2020
New Revision: 360225
URL: https://svnweb.freebsd.org/changeset/base/360225
Log:
MFC r359938:
Remove bogus use of useracc() in (clock_)nanosleep.
There's no point in pre-checking that we can access the user's rmtp
pointer before we do it in copyout().
While here, improve style(9) compliance.
Reviewed by: imp
Sponsored by: DARPA
Differential Revision: https://reviews.freebsd.org/D24409
Modified:
stable/11/sys/compat/freebsd32/freebsd32_misc.c
stable/11/sys/kern/kern_time.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/11/sys/compat/freebsd32/freebsd32_misc.c Thu Apr 23 17:30:03 2020 (r360224)
+++ stable/11/sys/compat/freebsd32/freebsd32_misc.c Thu Apr 23 17:46:29 2020 (r360225)
@@ -2325,7 +2325,7 @@ freebsd32_user_clock_nanosleep(struct thread *td, cloc
{
struct timespec32 rmt32, rqt32;
struct timespec rmt, rqt;
- int error;
+ int error, error2;
error = copyin(ua_rqtp, &rqt32, sizeof(rqt32));
if (error)
@@ -2334,18 +2334,13 @@ freebsd32_user_clock_nanosleep(struct thread *td, cloc
CP(rqt32, rqt, tv_sec);
CP(rqt32, rqt, tv_nsec);
- if (ua_rmtp != NULL && (flags & TIMER_ABSTIME) == 0 &&
- !useracc(ua_rmtp, sizeof(rmt32), VM_PROT_WRITE))
- return (EFAULT);
error = kern_clock_nanosleep(td, clock_id, flags, &rqt, &rmt);
if (error == EINTR && ua_rmtp != NULL && (flags & TIMER_ABSTIME) == 0) {
- int error2;
-
CP(rmt, rmt32, tv_sec);
CP(rmt, rmt32, tv_nsec);
error2 = copyout(&rmt32, ua_rmtp, sizeof(rmt32));
- if (error2)
+ if (error2 != 0)
error = error2;
}
return (error);
Modified: stable/11/sys/kern/kern_time.c
==============================================================================
--- stable/11/sys/kern/kern_time.c Thu Apr 23 17:30:03 2020 (r360224)
+++ stable/11/sys/kern/kern_time.c Thu Apr 23 17:46:29 2020 (r360225)
@@ -613,20 +613,15 @@ user_clock_nanosleep(struct thread *td, clockid_t cloc
const struct timespec *ua_rqtp, struct timespec *ua_rmtp)
{
struct timespec rmt, rqt;
- int error;
+ int error, error2;
error = copyin(ua_rqtp, &rqt, sizeof(rqt));
if (error)
return (error);
- if (ua_rmtp != NULL && (flags & TIMER_ABSTIME) == 0 &&
- !useracc(ua_rmtp, sizeof(rmt), VM_PROT_WRITE))
- return (EFAULT);
error = kern_clock_nanosleep(td, clock_id, flags, &rqt, &rmt);
if (error == EINTR && ua_rmtp != NULL && (flags & TIMER_ABSTIME) == 0) {
- int error2;
-
error2 = copyout(&rmt, ua_rmtp, sizeof(rmt));
- if (error2)
+ if (error2 != 0)
error = error2;
}
return (error);
More information about the svn-src-all
mailing list