From owner-svn-src-head@FreeBSD.ORG Tue Sep 18 15:38:43 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 05DE5106564A; Tue, 18 Sep 2012 15:38:43 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E4C808FC14; Tue, 18 Sep 2012 15:38:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8IFcgop018341; Tue, 18 Sep 2012 15:38:42 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8IFcguO018335; Tue, 18 Sep 2012 15:38:42 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201209181538.q8IFcguO018335@svn.freebsd.org> From: Alexander Motin Date: Tue, 18 Sep 2012 15:38:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240655 - head/sys/boot/ofw/libofw X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2012 15:38:43 -0000 Author: mav Date: Tue Sep 18 15:38:42 2012 New Revision: 240655 URL: http://svn.freebsd.org/changeset/base/240655 Log: Fix panics on attempt to dereference uninitizlized pointer, returned via 'path' argument of ofw_parsedev() if devspec refers raw device with no path. For example, `ls /pci@1f,0/ide@d/disk@0,0:a/` works fine, while `ls /pci@1f,0/ide@d/disk@0,0:a` panicked before this change. Modified: head/sys/boot/ofw/libofw/devicename.c Modified: head/sys/boot/ofw/libofw/devicename.c ============================================================================== --- head/sys/boot/ofw/libofw/devicename.c Tue Sep 18 14:33:27 2012 (r240654) +++ head/sys/boot/ofw/libofw/devicename.c Tue Sep 18 15:38:42 2012 (r240655) @@ -105,7 +105,7 @@ ofw_parsedev(struct ofw_devdesc **dev, c return(ENOENT); found: - if (path != NULL && *s != '\0') + if (path != NULL) *path = s; idev = malloc(sizeof(struct ofw_devdesc)); if (idev == NULL) {