[POWERPC] bootwrapper: Decompress less, check more (02cc5114) · Commits · 戴 / test

Our kernels put everything in the first load segment, and we read that. Instead of decompressing 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 <miltonm@bga.com> Signed-off-by:

Paul Mackerras <paulus@samba.org>

arch/powerpc/boot/main.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,10 @@ static struct addr_range prep_kernel(void)
		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);

Admin message