Author: nwhitehorn
Date: Mon Apr 30 19:37:32 2018
New Revision: 333124
URL: https://svnweb.freebsd.org/changeset/base/333124

Log:
  Fix null pointer dereference on nodes without a "compatible" property.
  
  MFC after:    1 week

Modified:
  head/sys/powerpc/powermac/macio.c

Modified: head/sys/powerpc/powermac/macio.c
==============================================================================
--- head/sys/powerpc/powermac/macio.c   Mon Apr 30 19:21:20 2018        
(r333123)
+++ head/sys/powerpc/powermac/macio.c   Mon Apr 30 19:37:32 2018        
(r333124)
@@ -399,7 +399,8 @@ macio_attach(device_t dev)
                        continue;
 
                if (strcmp(ofw_bus_get_name(cdev), "bmac") == 0 ||
-                   strcmp(ofw_bus_get_compat(cdev), "bmac+") == 0) {
+                   (ofw_bus_get_compat(cdev) != NULL &&
+                   strcmp(ofw_bus_get_compat(cdev), "bmac+") == 0)) {
                        uint32_t fcr;
 
                        fcr = bus_read_4(sc->sc_memr, HEATHROW_FCR);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to