Tue Jul 21 18:42:56 2009 UTC ()
Do reject unknown/invalid linux clockid.


(njoly)
diff -r1.28 -r1.29 src/sys/compat/linux/common/linux_time.c
cvs diff -r1.28 -r1.29 src/sys/compat/linux/common/linux_time.c (expand / switch to unified diff)

--- src/sys/compat/linux/common/linux_time.c 2009/01/11 02:45:48 1.28
+++ src/sys/compat/linux/common/linux_time.c 2009/07/21 18:42:56 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: linux_time.c,v 1.28 2009/01/11 02:45:48 christos Exp $ */ 1/* $NetBSD: linux_time.c,v 1.29 2009/07/21 18:42:56 njoly Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 2001 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Emmanuel Dreyfus. 8 * by Emmanuel Dreyfus.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.28 2009/01/11 02:45:48 christos Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.29 2009/07/21 18:42:56 njoly Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/ucred.h> 36#include <sys/ucred.h>
37#include <sys/kauth.h> 37#include <sys/kauth.h>
38#include <sys/mount.h> 38#include <sys/mount.h>
39#include <sys/signal.h> 39#include <sys/signal.h>
40#include <sys/stdint.h> 40#include <sys/stdint.h>
41#include <sys/time.h> 41#include <sys/time.h>
42#include <sys/timetc.h> 42#include <sys/timetc.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/sched.h> 44#include <sys/sched.h>
45#include <sys/syscallargs.h> 45#include <sys/syscallargs.h>
46#include <sys/lwp.h> 46#include <sys/lwp.h>
@@ -171,26 +171,27 @@ int @@ -171,26 +171,27 @@ int
171linux_to_native_clockid(clockid_t *n, clockid_t l) 171linux_to_native_clockid(clockid_t *n, clockid_t l)
172{ 172{
173 switch (l) { 173 switch (l) {
174 case LINUX_CLOCK_REALTIME: 174 case LINUX_CLOCK_REALTIME:
175 *n = CLOCK_REALTIME; 175 *n = CLOCK_REALTIME;
176 break; 176 break;
177 case LINUX_CLOCK_MONOTONIC: 177 case LINUX_CLOCK_MONOTONIC:
178 *n = CLOCK_MONOTONIC; 178 *n = CLOCK_MONOTONIC;
179 break; 179 break;
180 case LINUX_CLOCK_PROCESS_CPUTIME_ID: 180 case LINUX_CLOCK_PROCESS_CPUTIME_ID:
181 case LINUX_CLOCK_THREAD_CPUTIME_ID: 181 case LINUX_CLOCK_THREAD_CPUTIME_ID:
182 case LINUX_CLOCK_REALTIME_HR: 182 case LINUX_CLOCK_REALTIME_HR:
183 case LINUX_CLOCK_MONOTONIC_HR: 183 case LINUX_CLOCK_MONOTONIC_HR:
 184 default:
184 return EINVAL; 185 return EINVAL;
185 } 186 }
186 187
187 return 0; 188 return 0;
188} 189}
189 190
190int 191int
191linux_sys_clock_gettime(struct lwp *l, const struct linux_sys_clock_gettime_args *uap, register_t *retval) 192linux_sys_clock_gettime(struct lwp *l, const struct linux_sys_clock_gettime_args *uap, register_t *retval)
192{ 193{
193 /* { 194 /* {
194 syscallarg(clockid_t) which; 195 syscallarg(clockid_t) which;
195 syscallarg(struct linux_timespec *)tp; 196 syscallarg(struct linux_timespec *)tp;
196 } */ 197 } */