Module Name: src
Committed By: njoly
Date: Sun May 25 14:56:46 UTC 2014
Modified Files:
src/sys/dev/pci: pci_subr.c
Log Message:
Do not crash if subclassp == NULL, seen while attaching rstx(4) which
match PCI_CLASS_UNDEFINED class.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/pci/pci_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/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.118 src/sys/dev/pci/pci_subr.c:1.119
--- src/sys/dev/pci/pci_subr.c:1.118 Sat May 24 18:06:21 2014
+++ src/sys/dev/pci/pci_subr.c Sun May 25 14:56:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.118 2014/05/24 18:06:21 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.119 2014/05/25 14:56:46 njoly Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.118 2014/05/24 18:06:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.119 2014/05/25 14:56:46 njoly Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -637,7 +637,8 @@ pci_devinfo(pcireg_t id_reg, pcireg_t cl
subclassp++;
}
- interfacep = (subclassp->name != NULL) ? subclassp->subclasses : NULL;
+ interfacep = (subclassp && subclassp->name != NULL) ?
+ subclassp->subclasses : NULL;
while (interfacep && interfacep->name != NULL) {
if (interface == interfacep->val)
break;
