Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit eb0cf3e19b4940a2d26dcdea03510ae16a580fcd

Authored by Lasse Collin
Committed by Linus Torvalds
1 parent 528941ca05

Decompressors: validate match distance in decompress_unlzma.c 

Validate the newly decoded distance (rep0) in process_bit1().  This is to
detect corrupt LZMA data quickly.  The old code can run for long time
producing garbage until it hits the end of the input.

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>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

lib/decompress_unlzma.c
Diff comments   View file @ eb0cf3e
... ... @@ -522,6 +522,9 @@
522 522 cst->rep0 = pos_slot;
523 523 if (++(cst->rep0) == 0)
524 524 return 0;
  525 + if (cst->rep0 > wr->header->dict_size
  526 + || cst->rep0 > get_pos(wr))
  527 + return -1;
525 528 }
526 529  
527 530 len += LZMA_MATCH_MIN_LEN;