Commit 8218a437 authored Jan 12, 2011 by Lasse Collin Committed by Linus Torvalds Jan 13, 2011

Decompressors: fix header validation in decompress_unlzma.c

Validation of header.pos calls error() but doesn't make the function
return to indicate an error to the caller.  Instead the decoding is
attempted with invalid header.pos.  This fixes it.

Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alain Knaff <alain@knaff.lu>
Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 22e44208

lib/decompress_unlzma.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -574,8 +574,10 @@ STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
		((unsigned char )&header)[i] = rc.ptr++;
		}

		if (header.pos >= (9 * 5 * 5))
		if (header.pos >= (9 * 5 * 5)) {
		error("bad header");
		goto exit_1;
		}

		mi = 0;
		lc = header.pos;

Admin message