Commit b5c8afe5 authored Dec 12, 2014 by Dan Carpenter Committed by Linus Torvalds Dec 13, 2014

decompress_bunzip2: off by one in get_next_block()



"origPtr" is used as an offset into the bd->dbuf[] array.  That array is
allocated in start_bunzip() and has "bd->dbufSize" number of elements so
the test here should be >= instead of >.

Later we check "origPtr" again before using it as an offset so I don't
know if this bug can be triggered in real life.

Fixes: bc22c17e ('bzip2/lzma: library support for gzip, bzip2 and lzma decompression')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Alain Knaff <alain@knaff.lu>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ec72c666

lib/decompress_bunzip2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ static int INIT get_next_block(struct bunzip_data *bd)
		if (get_bits(bd, 1))
		return RETVAL_OBSOLETE_INPUT;
		origPtr = get_bits(bd, 24);
		if (origPtr > dbufSize)
		if (origPtr >= dbufSize)
		return RETVAL_DATA_ERROR;
		/* mapping table: if some byte values are never used (encoding things
		like ascii text), the compression code removes the gaps to have fewer

Admin message