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

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

details:   https://anonhg.NetBSD.org/src/rev/2195b1cd0d3c
branches:  netbsd-3
changeset: 576361:2195b1cd0d3c
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 15:47:50 2005 +0000

description:
Pull up revision 1.23 (requested by elad in ticket #487):
Fix potential NULL pointer access.

diffstat:

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

diffs (35 lines):

diff -r e8e42e749f01 -r 2195b1cd0d3c sys/kern/kern_verifiedexec.c
--- a/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:47:29 2005 +0000
+++ b/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:47:50 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.13 2005/07/02 15:47:29 tron Exp $  */
+/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.14 2005/07/02 15:47:50 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.13 2005/07/02 15:47:29 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.9.2.14 2005/07/02 15:47:50 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -396,7 +396,7 @@
        case VERIEXEC_INDIRECT:
                break;
        case VERIEXEC_FILE:
-               if (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);
@@ -404,6 +404,7 @@
                        if (veriexec_strict > 1)
                                return (EPERM);
                }
+
                break;
        }