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

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

details:   https://anonhg.NetBSD.org/src/rev/49d76619742c
branches:  netbsd-3
changeset: 576362:49d76619742c
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 15:48:04 2005 +0000

description:
Pull up revision 1.24 (requested by elad in ticket #487):
Correctly handle the case of executing a 'FILE' entry.

diffstat:

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

diffs (39 lines):

diff -r 2195b1cd0d3c -r 49d76619742c sys/kern/kern_verifiedexec.c
--- a/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:47:50 2005 +0000
+++ b/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:48:04 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.14 2005/07/02 15:47:50 tron Exp $  */
+/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.15 2005/07/02 15:48:04 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.14 2005/07/02 15:47:50 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.9.2.15 2005/07/02 15:48:04 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -394,9 +394,7 @@
        switch (flag) {
        case VERIEXEC_DIRECT:
        case VERIEXEC_INDIRECT:
-               break;
-       case VERIEXEC_FILE:
-               if ((vp->vhe != NULL) && (vp->vhe->type != VERIEXEC_FILE)) {
+               if ((vp->vhe != NULL) && (vp->vhe->type == VERIEXEC_FILE)) {
                        veriexec_report("Execution of 'FILE' entry.",
                                        name, va, p, REPORT_NOVERBOSE,
                                        REPORT_ALARM, REPORT_NOPANIC);
@@ -406,6 +404,9 @@
                }
 
                break;
+
+       case VERIEXEC_FILE:
+               break;
        }
 
 out: