Commit dcd295f7bec22860063b1339162d18b811659c4b
Committed by
Greg Kroah-Hartman
1 parent
13b2e3a5c4
decompress_bunzip2: off by one in get_next_block()
commit b5c8afe5be51078a979d86ae5ae78c4ac948063d upstream. "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: bc22c17e12c1 ('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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
lib/decompress_bunzip2.c
... | ... | @@ -184,7 +184,7 @@ |
184 | 184 | if (get_bits(bd, 1)) |
185 | 185 | return RETVAL_OBSOLETE_INPUT; |
186 | 186 | origPtr = get_bits(bd, 24); |
187 | - if (origPtr > dbufSize) | |
187 | + if (origPtr >= dbufSize) | |
188 | 188 | return RETVAL_DATA_ERROR; |
189 | 189 | /* mapping table: if some byte values are never used (encoding things |
190 | 190 | like ascii text), the compression code removes the gaps to have fewer |