Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat/netbsd32 In the compat setitimer(2) calls, don't ...



details:   https://anonhg.NetBSD.org/src/rev/9a8b9bffeff8
branches:  trunk
changeset: 1018808:9a8b9bffeff8
user:      simonb <simonb%NetBSD.org@localhost>
date:      Thu Feb 18 12:54:03 2021 +0000

description:
In the compat setitimer(2) calls, don't validate which timer is being
used since dosetitimer() does this anyway.  The compat functions hadn't
been updated since ITIMER_MONOTONIC was introduced, so they reported
that that ITIMER_MONOTONIC timer was invalid.

diffstat:

 sys/compat/netbsd32/netbsd32_compat_50.c |  6 ++----
 sys/compat/netbsd32/netbsd32_time.c      |  6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r c25869d1419e -r 9a8b9bffeff8 sys/compat/netbsd32/netbsd32_compat_50.c
--- a/sys/compat/netbsd32/netbsd32_compat_50.c  Thu Feb 18 12:28:01 2021 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_50.c  Thu Feb 18 12:54:03 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_compat_50.c,v 1.50 2021/01/19 03:20:13 simonb Exp $   */
+/*     $NetBSD: netbsd32_compat_50.c,v 1.51 2021/02/18 12:54:03 simonb Exp $   */
 
 /*-
  * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.50 2021/01/19 03:20:13 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.51 2021/02/18 12:54:03 simonb Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -875,8 +875,6 @@
        struct itimerval aitv;
        int error;
 
-       if ((u_int)which > ITIMER_PROF)
-               return EINVAL;
        itv32 = SCARG_P32(uap, itv);
        if (itv32) {
                if ((error = copyin(itv32, &s32it, sizeof(s32it))))
diff -r c25869d1419e -r 9a8b9bffeff8 sys/compat/netbsd32/netbsd32_time.c
--- a/sys/compat/netbsd32/netbsd32_time.c       Thu Feb 18 12:28:01 2021 +0000
+++ b/sys/compat/netbsd32/netbsd32_time.c       Thu Feb 18 12:54:03 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_time.c,v 1.54 2021/01/19 03:20:13 simonb Exp $        */
+/*     $NetBSD: netbsd32_time.c,v 1.55 2021/02/18 12:54:03 simonb 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.54 2021/01/19 03:20:13 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.55 2021/02/18 12:54:03 simonb Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
@@ -142,8 +142,6 @@
        struct itimerval aitv;
        int error;
 
-       if ((u_int)which > ITIMER_PROF)
-               return EINVAL;
        itv32 = SCARG_P32(uap, itv);
        if (itv32) {
                if ((error = copyin(itv32, &s32it, sizeof(s32it))))



Home | Main Index | Thread Index | Old Index