Sat Jul 29 01:14:59 2017 UTC ()
Only let the superuser set the compat_linux timezone.

Not really keen to invent a new kauth cookie for this useless purpose.

From Ilja Van Sprundel.


(riastradh)
diff -r1.37 -r1.38 src/sys/compat/linux/common/linux_time.c
cvs diff -r1.37 -r1.38 src/sys/compat/linux/common/linux_time.c (expand / switch to unified diff)

--- src/sys/compat/linux/common/linux_time.c 2014/01/13 10:33:03 1.37
+++ src/sys/compat/linux/common/linux_time.c 2017/07/29 01:14:59 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: linux_time.c,v 1.37 2014/01/13 10:33:03 njoly Exp $ */ 1/* $NetBSD: linux_time.c,v 1.38 2017/07/29 01:14:59 riastradh 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.37 2014/01/13 10:33:03 njoly Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.38 2017/07/29 01:14:59 riastradh 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/systm.h> 42#include <sys/systm.h>
43#include <sys/sched.h> 43#include <sys/sched.h>
44#include <sys/syscallargs.h> 44#include <sys/syscallargs.h>
45#include <sys/lwp.h> 45#include <sys/lwp.h>
46#include <sys/proc.h> 46#include <sys/proc.h>
@@ -69,26 +69,29 @@ linux_sys_gettimeofday(struct lwp *l, co @@ -69,26 +69,29 @@ linux_sys_gettimeofday(struct lwp *l, co
69 /* { 69 /* {
70 syscallarg(struct timeval50 *) tz; 70 syscallarg(struct timeval50 *) tz;
71 syscallarg(struct timezone *) tzp; 71 syscallarg(struct timezone *) tzp;
72 } */ 72 } */
73 int error = 0; 73 int error = 0;
74 74
75 if (SCARG(uap, tp)) { 75 if (SCARG(uap, tp)) {
76 error = compat_50_sys_gettimeofday(l, (const void *)uap, retval); 76 error = compat_50_sys_gettimeofday(l, (const void *)uap, retval);
77 if (error) 77 if (error)
78 return (error); 78 return (error);
79 } 79 }
80 80
81 if (SCARG(uap, tzp)) { 81 if (SCARG(uap, tzp)) {
 82 if (kauth_authorize_generic(kauth_cred_get(),
 83 KAUTH_GENERIC_ISSUSER, NULL) != 0)
 84 return (EPERM);
82 error = copyout(&linux_sys_tz, SCARG(uap, tzp), sizeof(linux_sys_tz)); 85 error = copyout(&linux_sys_tz, SCARG(uap, tzp), sizeof(linux_sys_tz));
83 if (error) 86 if (error)
84 return (error); 87 return (error);
85 } 88 }
86 89
87 return (0); 90 return (0);
88} 91}
89 92
90int 93int
91linux_sys_settimeofday(struct lwp *l, const struct linux_sys_settimeofday_args *uap, register_t *retval) 94linux_sys_settimeofday(struct lwp *l, const struct linux_sys_settimeofday_args *uap, register_t *retval)
92{ 95{
93 /* { 96 /* {
94 syscallarg(struct timeval50 *) tp; 97 syscallarg(struct timeval50 *) tp;