From owner-svn-src-head@FreeBSD.ORG  Wed Mar  6 06:24:09 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C75D2641;
 Wed,  6 Mar 2013 06:24:09 +0000 (UTC)
 (envelope-from grehan@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 A31F7350;
 Wed,  6 Mar 2013 06:24:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r266O9Zl099407;
 Wed, 6 Mar 2013 06:24:09 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r266O94q099406;
 Wed, 6 Mar 2013 06:24:09 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201303060624.r266O94q099406@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Wed, 6 Mar 2013 06:24:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247865 - head/usr.sbin/bhyve
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: Wed, 06 Mar 2013 06:24:09 -0000

Author: grehan
Date: Wed Mar  6 06:24:09 2013
New Revision: 247865
URL: http://svnweb.freebsd.org/changeset/base/247865

Log:
  Reorder code to avoid the stat buffer being used uninitialized.
  
  Obtained from:	NetApp

Modified:
  head/usr.sbin/bhyve/acpi.c

Modified: head/usr.sbin/bhyve/acpi.c
==============================================================================
--- head/usr.sbin/bhyve/acpi.c	Wed Mar  6 06:19:56 2013	(r247864)
+++ head/usr.sbin/bhyve/acpi.c	Wed Mar  6 06:24:09 2013	(r247865)
@@ -687,12 +687,16 @@ basl_load(int fd, uint64_t off)
 	int err;
 
 	err = 0;
-	gaddr = paddr_guest2host(basl_acpi_base + off, sb.st_size);
-	if (gaddr != NULL) {
-		if (fstat(fd, &sb) < 0 || read(fd, gaddr, sb.st_size) < 0)
-			err = errno;
-	} else
-		err = EFAULT;
+        if (fstat(fd, &sb) < 0) {
+		err = errno;
+        } else {
+		gaddr = paddr_guest2host(basl_acpi_base + off, sb.st_size);
+		if (gaddr != NULL) {
+			if (read(fd, gaddr, sb.st_size) < 0)
+				err = errno;
+		} else
+			err = EFAULT;
+        }
 
 	return (err);
 }