Commit 4d4b866a authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

initrd: fix lz4 decompress with initrd 



During testing initrd (>2G) support, find decompress/lz4 does not work
with initrd at all.

decompress_* should support:
1. inbuf[]/outbuf[] for kernel preboot.
2. inbuf[]/flush() for initramfs
3. fill()/flush() for initrd.

in the unlz4 does not handle case 3, as input len is passed as 0, and it
failed in first try.

Fix that add one extra if (fill) checking, and get out if EOF from the
fill().

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa5a7a41

lib/decompress_unlz4.c

+43 −22
Original line number Diff line number Diff line
@@ -83,13 +83,20 @@ STATIC inline int INIT unlz4(u8 *input, int in_len, 
	if (posp)

		*posp = 0;



	if (fill)

		fill(inp, 4);

	if (fill) {

		size = fill(inp, 4);

		if (size < 4) {

			error("data corrupted");

			goto exit_2;

		}

	}



	chunksize = get_unaligned_le32(inp);

	if (chunksize == ARCHIVE_MAGICNUMBER) {

		if (!fill) {

			inp += 4;

			size -= 4;

		}

	} else {

		error("invalid header");

		goto exit_2;
@@ -100,29 +107,44 @@ STATIC inline int INIT unlz4(u8 *input, int in_len, 


	for (;;) {



		if (fill)

			fill(inp, 4);

		if (fill) {

			size = fill(inp, 4);

			if (size == 0)

				break;

			if (size < 4) {

				error("data corrupted");

				goto exit_2;

			}

		}



		chunksize = get_unaligned_le32(inp);

		if (chunksize == ARCHIVE_MAGICNUMBER) {

			if (!fill) {

				inp += 4;

				size -= 4;

			}

			if (posp)

				*posp += 4;

			continue;

		}

		inp += 4;

		size -= 4;





		if (posp)

			*posp += 4;



		if (fill) {

		if (!fill) {

			inp += 4;

			size -= 4;

		} else {

			if (chunksize > lz4_compressbound(uncomp_chunksize)) {

				error("chunk length is longer than allocated");

				goto exit_2;

			}

			fill(inp, chunksize);

			size = fill(inp, chunksize);

			if (size < chunksize) {

				error("data corrupted");

				goto exit_2;

			}

		}

#ifdef PREBOOT

		if (out_len >= uncomp_chunksize) {
@@ -149,6 +171,7 @@ STATIC inline int INIT unlz4(u8 *input, int in_len, 
		if (posp)

			*posp += chunksize;



		if (!fill) {

			size -= chunksize;



			if (size == 0)
@@ -157,10 +180,8 @@ STATIC inline int INIT unlz4(u8 *input, int in_len, 
				error("data corrupted");

				goto exit_2;

			}



			inp += chunksize;

		if (fill)

			inp = inp_start;

		}

	}



	ret = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE