crypto: change LZ4 modules to work with new LZ4 module version

Update the crypto modules using LZ4 compression as well as the test
cases in testmgr.h to work with the new LZ4 module version.

Link: http://lkml.kernel.org/r/1486321748-19085-4-git-send-email-4sschmid@informatik.uni-hamburg.de
Signed-off-by: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
Cc: Bongkyu Kim <bongkyu.kim@lge.com>
Cc: Rui Salvaterra <rsalvaterra@gmail.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Colin Cross <ccross@android.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 14 deletions

diff --git a/crypto/lz4.c b/crypto/lz4.c
index 99c1b2cc2976..71eff9b01b12 100644
--- a/crypto/lz4.c
+++ b/crypto/lz4.c
@@ -66,15 +66,13 @@ static void lz4_exit(struct crypto_tfm *tfm)
 static int __lz4_compress_crypto(const u8 *src, unsigned int slen,
                                  u8 *dst, unsigned int *dlen, void *ctx)
 {
-        size_t tmp_len = *dlen;
-        int err;
+        int out_len = LZ4_compress_default(src, dst,
+                slen, *dlen, ctx);
 
-        err = lz4_compress(src, slen, dst, &tmp_len, ctx);
-
-        if (err < 0)
+        if (!out_len)
                 return -EINVAL;
 
-        *dlen = tmp_len;
+        *dlen = out_len;
         return 0;
 }
 
@@ -96,16 +94,13 @@ static int lz4_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
 static int __lz4_decompress_crypto(const u8 *src, unsigned int slen,
                                    u8 *dst, unsigned int *dlen, void *ctx)
 {
-        int err;
-        size_t tmp_len = *dlen;
-        size_t __slen = slen;
+        int out_len = LZ4_decompress_safe(src, dst, slen, *dlen);
 
-        err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
-        if (err < 0)
-                return -EINVAL;
+        if (out_len < 0)
+                return out_len;
 
-        *dlen = tmp_len;
-        return err;
+        *dlen = out_len;
+        return 0;
 }
 
 static int lz4_sdecompress(struct crypto_scomp *tfm, const u8 *src,