summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_time.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1997-06-01 09:05:19 +0000
committerpeter <peter@FreeBSD.org>1997-06-01 09:05:19 +0000
commitf7b084ef3ded133aff1aac47e87b2b48ce8e1b76 (patch)
tree2c66b4b863c73c31a1cd1b5c190eae2fde0ddecc /sys/kern/kern_time.c
parente6f08b56a875b76720193c23108c342ac28ac9d6 (diff)
downloadFreeBSD-src-f7b084ef3ded133aff1aac47e87b2b48ce8e1b76.zip
FreeBSD-src-f7b084ef3ded133aff1aac47e87b2b48ce8e1b76.tar.gz
oops, fix a braino that I noticed during the commit.. Don't verify the
remaining time pointer if it's NULL, since we don't write back in that case! (*blush*!)
Diffstat (limited to 'sys/kern/kern_time.c')
-rw-r--r--sys/kern/kern_time.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index a77df03..c4918ed 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kern_time.c 8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.26 1997/05/10 12:00:03 peter Exp $
+ * $Id: kern_time.c,v 1.27 1997/06/01 09:01:07 peter Exp $
*/
#include <sys/param.h>
@@ -285,8 +285,9 @@ nanosleep(p, uap, retval)
error = copyin(SCARG(uap, rqtp), &rqt, sizeof(rqt));
if (error)
return (error);
- if (!useracc((caddr_t)SCARG(uap, rmtp), sizeof(rmt), B_WRITE))
- return (EFAULT);
+ if (SCARG(uap, rmtp))
+ if (!useracc((caddr_t)SCARG(uap, rmtp), sizeof(rmt), B_WRITE))
+ return (EFAULT);
error = nanosleep1(p, &rqt, &rmt);
@@ -321,8 +322,9 @@ signanosleep(p, uap, retval)
error = copyin(SCARG(uap, rqtp), &rqt, sizeof(rqt));
if (error)
return (error);
- if (!useracc((caddr_t)SCARG(uap, rmtp), sizeof(rmt), B_WRITE))
- return (EFAULT);
+ if (SCARG(uap, rmtp))
+ if (!useracc((caddr_t)SCARG(uap, rmtp), sizeof(rmt), B_WRITE))
+ return (EFAULT);
error = copyin(SCARG(uap, mask), &mask, sizeof(mask));
if (error)
return (error);
OpenPOWER on IntegriCloud