Module Name: src
Committed By: thorpej
Date: Thu Jan 28 15:53:46 UTC 2021
Modified Files:
src/sys/kern: subr_device.c
Log Message:
In device_is_a(), handle dev or dev->dv_cfdriver being NULL. This
makes the calling pattern:
device_is_a(device_parent(dev), "whatever")
safe.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/subr_device.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/subr_device.c
diff -u src/sys/kern/subr_device.c:1.3 src/sys/kern/subr_device.c:1.4
--- src/sys/kern/subr_device.c:1.3 Mon Mar 9 15:35:11 2015
+++ src/sys/kern/subr_device.c Thu Jan 28 15:53:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_device.c,v 1.3 2015/03/09 15:35:11 pooka Exp $ */
+/* $NetBSD: subr_device.c,v 1.4 2021/01/28 15:53:46 thorpej Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_device.c,v 1.3 2015/03/09 15:35:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_device.c,v 1.4 2021/01/28 15:53:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -176,6 +176,9 @@ device_properties(device_t dev)
bool
device_is_a(device_t dev, const char *dname)
{
+ if (dev == NULL || dev->dv_cfdriver == NULL) {
+ return false;
+ }
return strcmp(dev->dv_cfdriver->cd_name, dname) == 0;
}
