From 47280ef170b29ab10af5820bbfa047fb203aa733 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Mon, 30 Apr 2018 19:37:32 +0000 Subject: [PATCH] Fix null pointer dereference on nodes without a "compatible" property. MFC after: 1 week --- sys/powerpc/powermac/macio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index 42eb5dcd8c5..f44a47ee5c4 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -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);