From owner-svn-src-projects@FreeBSD.ORG Fri Oct 9 03:03:27 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 603A01065670; Fri, 9 Oct 2009 03:03:27 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 34B148FC0C; Fri, 9 Oct 2009 03:03:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9933RBG041071; Fri, 9 Oct 2009 03:03:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9933Ruf041067; Fri, 9 Oct 2009 03:03:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200910090303.n9933Ruf041067@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 9 Oct 2009 03:03:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197892 - in projects/ppc64/sys/powerpc: cell mambo ofw X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2009 03:03:27 -0000 Author: nwhitehorn Date: Fri Oct 9 03:03:26 2009 New Revision: 197892 URL: http://svn.freebsd.org/changeset/base/197892 Log: Fix a trio of NULL pointer dereferences found after making them fatal. Note: the memory allocation scheme used by ofw_real.c is quite fragile. We need to come up with something better. Modified: projects/ppc64/sys/powerpc/cell/celliic.c projects/ppc64/sys/powerpc/mambo/mambo_openpic.c projects/ppc64/sys/powerpc/ofw/ofw_real.c Modified: projects/ppc64/sys/powerpc/cell/celliic.c ============================================================================== --- projects/ppc64/sys/powerpc/cell/celliic.c Fri Oct 9 03:02:30 2009 (r197891) +++ projects/ppc64/sys/powerpc/cell/celliic.c Fri Oct 9 03:03:26 2009 (r197892) @@ -96,7 +96,7 @@ celliic_probe(device_t dev) { const char *type = ofw_bus_get_type(dev); - if (strcmp(type, "stidc-iic") != 0) + if (type == NULL || strcmp(type, "stidc-iic") != 0) return (ENXIO); device_set_desc(dev, "Cell Integrated Interrupt Controller"); Modified: projects/ppc64/sys/powerpc/mambo/mambo_openpic.c ============================================================================== --- projects/ppc64/sys/powerpc/mambo/mambo_openpic.c Fri Oct 9 03:02:30 2009 (r197891) +++ projects/ppc64/sys/powerpc/mambo/mambo_openpic.c Fri Oct 9 03:03:26 2009 (r197892) @@ -121,7 +121,7 @@ openpicbus_mambo_probe(device_t dev) { const char *type = ofw_bus_get_type(dev); - if (strcmp(type, "open-pic") != 0) + if (type == NULL || strcmp(type, "open-pic") != 0) return (ENXIO); device_set_desc(dev, "Mambo OpenPIC Container"); Modified: projects/ppc64/sys/powerpc/ofw/ofw_real.c ============================================================================== --- projects/ppc64/sys/powerpc/ofw/ofw_real.c Fri Oct 9 03:02:30 2009 (r197891) +++ projects/ppc64/sys/powerpc/ofw/ofw_real.c Fri Oct 9 03:03:26 2009 (r197892) @@ -173,7 +173,7 @@ extern struct pmap ofw_pmap; static void ofw_real_bounce_alloc(void *); -SYSINIT(ofw_real_bounce_alloc, SI_SUB_VM, SI_ORDER_ANY, +SYSINIT(ofw_real_bounce_alloc, SI_SUB_KMEM, SI_ORDER_ANY, ofw_real_bounce_alloc, NULL); static void