lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompression
authorLasse Collin <lasse.collin@tukaani.org>
Sun, 10 Oct 2021 21:31:39 +0000 (05:31 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:16:17 +0000 (19:16 +0100)
commit5329376ce6ae6ebda1433ba857c75f8ffbc9275b
tree73f17175038fc09c3b3a6506528eea8ad899c16e
parent562d350a88097ab7c314dbf90b7bfc07704284f2
lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompression

[ Upstream commit 83d3c4f22a36d005b55f44628f46cc0d319a75e8 ]

With valid files, the safety margin described in lib/decompress_unxz.c
ensures that these buffers cannot overlap. But if the uncompressed size
of the input is larger than the caller thought, which is possible when
the input file is invalid/corrupt, the buffers can overlap. Obviously
the result will then be garbage (and usually the decoder will return
an error too) but no other harm will happen when such an over-run occurs.

This change only affects uncompressed LZMA2 chunks and so this
should have no effect on performance.

Link: https://lore.kernel.org/r/20211010213145.17462-2-xiang@kernel.org
Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
lib/decompress_unxz.c
lib/xz/xz_dec_lzma2.c