Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dd68eb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'compress-3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull compress bugfix from Greg KH:
 "Here is another lz4 bugfix for 3.16-rc3 that resolves a reported issue
  with that compression algorithm"

* tag 'compress-3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  lz4: fix another possible overrun
parents 772205d8 4148c1f6

lib/lz4/lz4_decompress.c

+3 −1
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ static int lz4_uncompress(const char *source, char *dest, int osize) 
		if (length == ML_MASK) {

			for (; *ip == 255; length += 255)

				ip++;

			if (unlikely(length > (size_t)(length + *ip)))

				goto _output_error;

			length += *ip++;

		}
@@ -157,7 +159,7 @@ static int lz4_uncompress(const char *source, char *dest, int osize) 


	/* write overflow error detected */

_output_error:

	return (int) (-(((char *)ip) - source));

	return -1;

}



static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,