diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-12-12 16:58:05 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-02-20 00:49:30 +0000 |
| commit | c2895979352e50321dddd7156272890f9cd14de1 (patch) | |
| tree | 70bfb3dddf9074f434b670ee99a1fc1f1ed61d97 /lib/decompress_bunzip2.c | |
| parent | 277d8276eec6c1861bff8d08c4f0d67d7a9185f1 (diff) | |
| download | kernel_samsung_smdk4412-c2895979352e50321dddd7156272890f9cd14de1.zip kernel_samsung_smdk4412-c2895979352e50321dddd7156272890f9cd14de1.tar.gz kernel_samsung_smdk4412-c2895979352e50321dddd7156272890f9cd14de1.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'lib/decompress_bunzip2.c')
| -rw-r--r-- | lib/decompress_bunzip2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index a7b80c1..6a110e2 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c @@ -185,7 +185,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 |