[src/netbsd-7]: src/sys/kern Pull up following revision(s) (requested by mlel...

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

details:   https://anonhg.NetBSD.org/src/rev/648dd414a1dc
branches:  netbsd-7
changeset: 799929:648dd414a1dc
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Jul 05 19:06:48 2016 +0000

description:
Pull up following revision(s) (requested by mlelstv in ticket #1185):
        sys/kern/kern_subr.c: revision 1.215
don't crash if rootspec is invalid

diffstat:

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

diffs (28 lines):

diff -r db05d5e8180e -r 648dd414a1dc sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Tue Jul 05 19:03:31 2016 +0000
+++ b/sys/kern/kern_subr.c      Tue Jul 05 19:06:48 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $    */
+/*     $NetBSD: kern_subr.c,v 1.214.4.1 2016/07/05 19:06:48 snj Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.214.4.1 2016/07/05 19:06:48 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -422,7 +422,8 @@
                }
 
                if (rootdev == NODEV &&
-                   device_class(dv) == DV_DISK && device_is_a(dv, "dk") &&
+                   dv != NULL && device_class(dv) == DV_DISK &&
+                   device_is_a(dv, "dk") &&
                    (majdev = devsw_name2blk(device_xname(dv), NULL, 0)) >= 0)
                        rootdev = makedev(majdev, device_unit(dv));