From owner-svn-src-head@FreeBSD.ORG  Wed May 21 17:37:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2E3AED22;
 Wed, 21 May 2014 17:37:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C3C42D3F;
 Wed, 21 May 2014 17:37:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LHbMkI021143;
 Wed, 21 May 2014 17:37:22 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4LHbM8T021142;
 Wed, 21 May 2014 17:37:22 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201405211737.s4LHbM8T021142@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 21 May 2014 17:37:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266511 - head/usr.bin/mkimg
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.18
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, 21 May 2014 17:37:23 -0000

Author: marcel
Date: Wed May 21 17:37:22 2014
New Revision: 266511
URL: http://svnweb.freebsd.org/changeset/base/266511

Log:
  Fix CID 1215125: fstat(2) returns -1 on error and sets errno. It does
  not return the error (oops).

Modified:
  head/usr.bin/mkimg/scheme.c

Modified: head/usr.bin/mkimg/scheme.c
==============================================================================
--- head/usr.bin/mkimg/scheme.c	Wed May 21 17:36:12 2014	(r266510)
+++ head/usr.bin/mkimg/scheme.c	Wed May 21 17:37:22 2014	(r266511)
@@ -103,14 +103,12 @@ int
 scheme_bootcode(int fd)
 {
 	struct stat sb;
-	int error;
 
 	if (scheme->bootcode == 0)
 		return (ENXIO);
 
-	error = fstat(fd, &sb);
-	if (error)
-		return (error);
+	if (fstat(fd, &sb) == -1)
+		return (errno);
 	if (sb.st_size > scheme->bootcode)
 		return (EFBIG);