svn commit: r247865 - head/usr.sbin/bhyve

[Peter Grehan]

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);
 }