[src/netbsd-1-5]: src/sys/kern Pull up revision 1.55 (requested by tron):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/246387d020f3
branches:  netbsd-1-5
changeset: 491885:246387d020f3
user:      he <he%NetBSD.org@localhost>
date:      Mon Jun 11 19:31:16 2001 +0000

description:
Pull up revision 1.55 (requested by tron):
  Lower interrupt priority properly in the error path of settime(),
  e.g. when it's denied due to securelevel being above 1.  Fixes
  PR#13158.

diffstat:

 sys/kern/kern_time.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c9cfb8970b77 -r 246387d020f3 sys/kern/kern_time.c
--- a/sys/kern/kern_time.c      Mon Jun 11 19:24:47 2001 +0000
+++ b/sys/kern/kern_time.c      Mon Jun 11 19:31:16 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_time.c,v 1.47.2.2 2000/08/16 01:20:31 itojun Exp $        */
+/*     $NetBSD: kern_time.c,v 1.47.2.3 2001/06/11 19:31:16 he Exp $    */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -119,11 +119,15 @@
        /* WHAT DO WE DO ABOUT PENDING REAL-TIME TIMEOUTS??? */
        s = splclock();
        timersub(tv, &time, &delta);
-       if ((delta.tv_sec < 0 || delta.tv_usec < 0) && securelevel > 1)
+       if ((delta.tv_sec < 0 || delta.tv_usec < 0) && securelevel > 1) {
+               splx(s);
                return (EPERM);
+       }
 #ifdef notyet
-       if ((delta.tv_sec < 86400) && securelevel > 0)
+       if ((delta.tv_sec < 86400) && securelevel > 0) {
+               splx(s);
                return (EPERM);
+       }
 #endif
        time = *tv;
        (void) spllowersoftclock();