[src/netbsd-2-0]: src/sys/miscfs/procfs Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/42d38eeed237
branches:  netbsd-2-0
changeset: 565013:42d38eeed237
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Oct 29 13:00:45 2006 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #10739):
        sys/miscfs/procfs/procfs_linux.c: revision 1.28
PR/34888: Nicolas Joly: kernel panic while trying to access
/emul/linux/proc/0/stat
Patch applied, thanks for the report!

diffstat:

 sys/miscfs/procfs/procfs_linux.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 0e91712a2843 -r 42d38eeed237 sys/miscfs/procfs/procfs_linux.c
--- a/sys/miscfs/procfs/procfs_linux.c  Sun Oct 22 16:37:28 2006 +0000
+++ b/sys/miscfs/procfs/procfs_linux.c  Sun Oct 29 13:00:45 2006 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: procfs_linux.c,v 1.15.2.2 2004/08/30 08:53:05 tron Exp $      */
+/*      $NetBSD: procfs_linux.c,v 1.15.2.3 2006/10/29 13:00:45 tron Exp $      */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.15.2.2 2004/08/30 08:53:05 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.15.2.3 2006/10/29 13:00:45 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -168,7 +168,7 @@
            p->p_pid,
            p->p_comm,
            "0IR3SZD"[(p->p_stat > 6) ? 0 : (int)p->p_stat],
-           p->p_pptr->p_pid,
+           (p->p_pptr != NULL) ? p->p_pptr->p_pid : 0,
 
            p->p_pgid,
            p->p_session->s_sid,