Subject: [PATCH 4/4] bootwrapper: decompress less, check more

From: Milton Miller <[email-masked]>
Date: Wed, 28 Mar 2007 02:21:05 -0600 (CST)

Our kernels put everything in the first load segment, and we read that.
Instead of decompresing to the end of the gzip stream or supplied image
and hoping we get it all, decompress the expected size and complain if
it is not available.

Signed-off-by: Milton Miller <[email-masked]>

Index: kernel/arch/powerpc/boot/main.c
===================================================================
--- kernel.orig/arch/powerpc/boot/main.c	2007-03-28 01:09:04.000000000 -0500
+++ kernel/arch/powerpc/boot/main.c	2007-03-28 01:42:48.000000000 -0500
@@ -141,11 +141,14 @@ static struct addr_range prep_kernel(voi
 	}
 
 	/* Finally, gunzip the kernel */
-	printf("gunzipping (0x%p <- 0x%p:0x%p)...", addr,
-	       vmlinuz_addr, vmlinuz_addr+vmlinuz_size);
+	printf("gunzipping (0x%p:0x%p <- 0x%p:0x%p)...", addr,
+	       addr + ei.loadsize, vmlinuz_addr, vmlinuz_addr+vmlinuz_size);
 	/* discard up to the actual load data */
 	gunzip_discard(&gzstate, ei.elfoffset - sizeof(elfheader));
-	len = gunzip_finish(&gzstate, addr, ei.memsize);
+	len = gunzip_finish(&gzstate, addr, ei.loadsize);
+	if (len != ei.loadsize)
+		fatal("ran out of data!  only got 0x%x of 0x%lx bytes.\n\r",
+				len, ei.loadsize);
 	printf("done 0x%x bytes\n\r", len);
 
 	flush_cache(addr, ei.loadsize);