Module Name: src
Committed By: njoly
Date: Sun Feb 26 10:26:19 UTC 2017
Modified Files:
src/sys/compat/netbsd32: netbsd32_time.c
Log Message:
Apply fix from natuve clock_nanosleep(2) to not copyout remaining time
struct if TIMER_ABSTIME flag is set.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/compat/netbsd32/netbsd32_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_time.c
diff -u src/sys/compat/netbsd32/netbsd32_time.c:1.48 src/sys/compat/netbsd32/netbsd32_time.c:1.49
--- src/sys/compat/netbsd32/netbsd32_time.c:1.48 Fri Sep 23 14:16:32 2016
+++ src/sys/compat/netbsd32/netbsd32_time.c Sun Feb 26 10:26:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_time.c,v 1.48 2016/09/23 14:16:32 skrll Exp $ */
+/* $NetBSD: netbsd32_time.c,v 1.49 2017/02/26 10:26:19 njoly Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.48 2016/09/23 14:16:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.49 2017/02/26 10:26:19 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -453,7 +453,8 @@ netbsd32_clock_nanosleep(struct lwp *l,
goto out;
netbsd32_from_timespec(&rmt, &ts32);
- if ((error1 = copyout(&ts32, SCARG_P32(uap, rmtp), sizeof(ts32))) != 0)
+ if ((SCARG(uap, flags) & TIMER_ABSTIME) == 0 &&
+ (error1 = copyout(&ts32, SCARG_P32(uap, rmtp), sizeof(ts32))) != 0)
error = error1;
out:
*retval = error;
