From owner-svn-src-all@freebsd.org  Sun Dec 11 03:59:38 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C5EAC65EB5;
 Sun, 11 Dec 2016 03:59:38 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 370281043;
 Sun, 11 Dec 2016 03:59:38 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBB3xbEQ016729;
 Sun, 11 Dec 2016 03:59:37 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBB3xbc1016728;
 Sun, 11 Dec 2016 03:59:37 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201612110359.uBB3xbc1016728@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 11 Dec 2016 03:59:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r309844 - stable/11/usr.bin/mkimg
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Dec 2016 03:59:38 -0000

Author: marcel
Date: Sun Dec 11 03:59:37 2016
New Revision: 309844
URL: https://svnweb.freebsd.org/changeset/base/309844

Log:
  MFC r306299:
  
  Update local variable 'block' after calling capacity_resize(),
  otherwise format_resize(), which is called right after, isn't
  getting the current/actual image size. Rather than rounding up,
  format_resize() could end up truncating the size and we don't
  allow that by design.

Modified:
  stable/11/usr.bin/mkimg/mkimg.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/mkimg/mkimg.c
==============================================================================
--- stable/11/usr.bin/mkimg/mkimg.c	Sun Dec 11 03:57:21 2016	(r309843)
+++ stable/11/usr.bin/mkimg/mkimg.c	Sun Dec 11 03:59:37 2016	(r309844)
@@ -463,13 +463,16 @@ mkimg(void)
 
 	block = scheme_metadata(SCHEME_META_IMG_END, block);
 	error = image_set_size(block);
-	if (!error)
+	if (!error) {
 		error = capacity_resize(block);
-	if (!error)
+		block = image_get_size();
+	}
+	if (!error) {
 		error = format_resize(block);
+		block = image_get_size();
+	}
 	if (error)
 		errc(EX_IOERR, error, "image sizing");
-	block = image_get_size();
 	ncyls = block / (nsecs * nheads);
 	error = scheme_write(block);
 	if (error)