Module Name: src
Committed By: snj
Date: Tue Jul 5 19:06:48 UTC 2016
Modified Files:
src/sys/kern [netbsd-7]: kern_subr.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.214.4.1 src/sys/kern/kern_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.214 src/sys/kern/kern_subr.c:1.214.4.1
--- src/sys/kern/kern_subr.c:1.214 Mon Dec 9 16:49:43 2013
+++ src/sys/kern/kern_subr.c Tue Jul 5 19:06:48 2016
@@ -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 @@ setroot(device_t bootdv, int bootpartiti
}
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));
