[src/netbsd-3]: src/sys/kern Pull up revision 1.25 (requested by elad in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/622d74d4347c
branches:  netbsd-3
changeset: 576363:622d74d4347c
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 15:48:21 2005 +0000

description:
Pull up revision 1.25 (requested by elad in ticket #487):
Sync reality with comments. This makes strict level 1 work as expected.
Reported by Nino Dehne.

diffstat:

 sys/kern/kern_verifiedexec.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 49d76619742c -r 622d74d4347c sys/kern/kern_verifiedexec.c
--- a/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:48:04 2005 +0000
+++ b/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:48:21 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.15 2005/07/02 15:48:04 tron Exp $  */
+/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.16 2005/07/02 15:48:21 tron Exp $  */
 
 /*-
  * Copyright 2005 Elad Efrat <elad%bsd.org.il@localhost>
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.9.2.15 2005/07/02 15:48:04 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.9.2.16 2005/07/02 15:48:21 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -469,9 +469,10 @@
                 *   - File is being accessed, and we're in strict
                 *     level 2.
                 */
-               if ((veriexec_strict > 1) ||
-                   ((veriexec_strict == 1) &&
-                   ((flag == VERIEXEC_FILE) || (flag == VERIEXEC_INDIRECT))))
+               if (((veriexec_strict == 1) &&
+                   ((flag == VERIEXEC_DIRECT) ||
+                    (flag == VERIEXEC_INDIRECT))) ||
+                   (veriexec_strict > 1))
                        error = EPERM;
 
                break;