Commit d801ab20 authored Aug 22, 2014 by KOVACS Krisztian Committed by Herbert Xu Aug 29, 2014

crypto: lz4,lz4hc - fix decompression



The lz4 library has two functions for decompression, with slightly
different signatures and behaviour. The lz4_decompress_crypto() function
seemed to be using the one that assumes that the decompressed length is
known in advance.

This patch switches to the other decompression function and makes sure
that the length of the decompressed output is properly returned to the
caller.

The same issue was present in the lz4hc algorithm.

Coincidentally, this change also makes very basic lz4 and lz4hc
compression tests in testmgr pass.

Signed-off-by: KOVACS Krisztian <hidden@sch.bme.hu>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 51269ad2

crypto/lz4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ static int lz4_decompress_crypto(struct crypto_tfm tfm, const u8 src,
		size_t tmp_len = *dlen;
		size_t __slen = slen;

		err = lz4_decompress(src, &__slen, dst, tmp_len);
		err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
		if (err < 0)
		return -EINVAL;

crypto/lz4hc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ static int lz4hc_decompress_crypto(struct crypto_tfm tfm, const u8 src,
		size_t tmp_len = *dlen;
		size_t __slen = slen;

		err = lz4_decompress(src, &__slen, dst, tmp_len);
		err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
		if (err < 0)
		return -EINVAL;

Admin message