summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKOVACS Krisztian <hidden@sch.bme.hu>2014-08-22 10:44:35 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2014-08-29 21:46:35 +0800
commitd801ab204b5a500b66ca285ac7b440cc79933a27 (patch)
treec85e733e33bf60f21fe018e9529cd12b9479f0ba
parent51269ad2880774e7d46fb1e0edb7a83e15d05d33 (diff)
downloadlinux-stable-d801ab204b5a500b66ca285ac7b440cc79933a27.tar.gz
linux-stable-d801ab204b5a500b66ca285ac7b440cc79933a27.tar.bz2
linux-stable-d801ab204b5a500b66ca285ac7b440cc79933a27.zip
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>
-rw-r--r--crypto/lz4.c2
-rw-r--r--crypto/lz4hc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/lz4.c b/crypto/lz4.c
index 4586dd15b0d8..34d072b72a73 100644
--- a/crypto/lz4.c
+++ b/crypto/lz4.c
@@ -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;
diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c
index 151ba31d34e3..9218b3fed5e3 100644
--- a/crypto/lz4hc.c
+++ b/crypto/lz4hc.c
@@ -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;