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

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

details:   https://anonhg.NetBSD.org/src/rev/2f2b1a91cbff
branches:  netbsd-3-0
changeset: 579320:2f2b1a91cbff
user:      ghen <ghen%NetBSD.org@localhost>
date:      Tue Oct 24 17:03:54 2006 +0000

description:
Pull up following revision(s) (requested by elad in ticket #1567):
        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 71691ff75d2a -r 2f2b1a91cbff sys/miscfs/procfs/procfs_linux.c
--- a/sys/miscfs/procfs/procfs_linux.c  Tue Oct 24 16:59:02 2006 +0000
+++ b/sys/miscfs/procfs/procfs_linux.c  Tue Oct 24 17:03:54 2006 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: procfs_linux.c,v 1.22 2005/03/01 04:39:59 christos Exp $      */
+/*      $NetBSD: procfs_linux.c,v 1.22.4.1 2006/10/24 17:03:54 ghen Exp $      */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.22 2005/03/01 04:39:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.22.4.1 2006/10/24 17:03:54 ghen Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -163,7 +163,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,