From owner-svn-src-head@FreeBSD.ORG  Thu Dec 13 03:35:47 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 BCC2CD18;
 Thu, 13 Dec 2012 03:35:47 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A0BB98FC12;
 Thu, 13 Dec 2012 03:35:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBD3ZldS029566;
 Thu, 13 Dec 2012 03:35:47 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBD3ZlUi029565;
 Thu, 13 Dec 2012 03:35:47 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201212130335.qBD3ZlUi029565@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Thu, 13 Dec 2012 03:35:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244171 - head/sys/dev/uart
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 03:35:47 -0000

Author: gonzo
Date: Thu Dec 13 03:35:47 2012
New Revision: 244171
URL: http://svnweb.freebsd.org/changeset/base/244171

Log:
  Prevent possible usage of uninitialized pbase variable by checking
      return value of fdt_get_range

Modified:
  head/sys/dev/uart/uart_bus_fdt.c

Modified: head/sys/dev/uart/uart_bus_fdt.c
==============================================================================
--- head/sys/dev/uart/uart_bus_fdt.c	Thu Dec 13 03:34:24 2012	(r244170)
+++ head/sys/dev/uart/uart_bus_fdt.c	Thu Dec 13 03:35:47 2012	(r244171)
@@ -206,8 +206,10 @@ uart_cpu_getdev(int devtype, struct uart
 	err = fdt_regsize(node, &start, &size);
 	if (err)
 		return (ENXIO);
+	err = fdt_get_range(OF_parent(node), 0, &pbase, &psize);
+	if (err)
+		pbase = 0;
 
-	fdt_get_range(OF_parent(node), 0, &pbase, &psize);
 	start += pbase;
 
 	return (bus_space_map(di->bas.bst, start, size, 0, &di->bas.bsh));