Wed Jan 1 10:35:10 2020 UTC ()

Adjust image size appropriately when using update_image

OK jmcneill


(skrll)

diff -r1.27 -r1.28 src/usr.bin/mkubootimage/mkubootimage.c

--- src/usr.bin/mkubootimage/mkubootimage.c 2019/12/07 12:34:17	1.27
+++ src/usr.bin/mkubootimage/mkubootimage.c 2020/01/01 10:35:10	1.28

 @@ -1,14 +1,14 @@
-/* $NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.28 2020/01/01 10:35:10 skrll Exp $ */
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
 @@ -20,27 +20,27 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.28 2020/01/01 10:35:10 skrll Exp $");
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 @@ -324,27 +324,28 @@ generate_header_uimg(struct uboot_image_
 	if (image_type == IH_TYPE_SCRIPT) {
 		struct iovec iov[3];
 		dsize = st.st_size + (sizeof(uint32_t) * 2);
 		size_buf[0] = htonl(st.st_size);
 		size_buf[1] = htonl(0);
 		iov[0].iov_base = &size_buf[0];
 		iov[0].iov_len = sizeof(size_buf[0]);
 		iov[1].iov_base = &size_buf[1];
 		iov[1].iov_len = sizeof(size_buf[1]);
 		iov[2].iov_base = p;
 		iov[2].iov_len = st.st_size;
 		crc = crc32v(iov, 3);
 	} else {
-		dsize = st.st_size;
+		dsize = update_image ?
 		    st.st_size - sizeof(*hdr) : st.st_size;
 		crc = crc32(p, st.st_size);
+	}
 	munmap(p, st.st_size);
 	memset(hdr, 0, sizeof(*hdr));
 	hdr->ih_magic = htonl(image_magic);
 	hdr->ih_time = htonl(st.st_mtime);
 	hdr->ih_size = htonl(dsize);
 	hdr->ih_load = htonl(image_loadaddr);
 	hdr->ih_ep = htonl(image_entrypoint);
 	hdr->ih_dcrc = htonl(crc);
 	hdr->ih_os = image_os;
 	hdr->ih_arch = image_arch;
 @@ -377,30 +378,33 @@ generate_header_arm64(struct arm64_image
 	error = fstat(kernel_fd, &st);
 	if (error == -1) {
 		perror("stat");
 		return errno;
+	}
 	flags = 0;
 	flags |= ARM64_FLAGS_PAGE_SIZE_4K;
 #if 0
 	flags |= ARM64_FLAGS_PHYS_PLACEMENT_ANY;
 #endif
 	const uint64_t dsize = update_image ?
 	   st.st_size - sizeof(*hdr) : st.st_size;
 	memset(hdr, 0, sizeof(*hdr));
 	hdr->code0 = htole32(ARM64_CODE0);
 	hdr->text_offset = htole64(image_entrypoint);
-	hdr->image_size = htole64(st.st_size + sizeof(*hdr));
+	hdr->image_size = htole64(dsize);
 	hdr->flags = htole32(flags);
 	hdr->magic = htole32(ARM64_MAGIC);
 	dump_header_arm64(hdr);
 	return 0;
+}
 static int
 write_image(void *hdr, size_t hdrlen, int kernel_fd, int image_fd)
+{
 	uint8_t buf[4096];
 	ssize_t rlen, wlen;