From: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
To: akpm@linux-foundation.org
Cc: bongkyu.kim@lge.com, rsalvaterra@gmail.com,
sergey.senozhatsky@gmail.com, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org, herbert@gondor.apana.org.au,
davem@davemloft.net, linux-crypto@vger.kernel.org,
anton@enomsg.org, ccross@android.com, keescook@chromium.org,
tony.luck@intel.com,
Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
Subject: [PATCH v5 3/5] crypto: Change LZ4 modules to work with new LZ4 module version
Date: Thu, 26 Jan 2017 08:57:33 +0100 [thread overview]
Message-ID: <1485417455-31726-4-git-send-email-4sschmid@informatik.uni-hamburg.de> (raw)
In-Reply-To: <1485417455-31726-1-git-send-email-4sschmid@informatik.uni-hamburg.de>
This patch updates the crypto modules using LZ4 compression
to work with the new LZ4 module version.
Signed-off-by: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
---
crypto/lz4.c | 21 ++++++++-------------
crypto/lz4hc.c | 21 ++++++++-------------
2 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/crypto/lz4.c b/crypto/lz4.c
index 99c1b2c..40fd2c2 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, (int)((size_t)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, (int)((size_t)dlen));
- err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
- if (err < 0)
+ if (out_len < 0)
return -EINVAL;
- *dlen = tmp_len;
- return err;
+ *dlen = out_len;
+ return out_len;
}
static int lz4_sdecompress(struct crypto_scomp *tfm, const u8 *src,
diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c
index 75ffc4a..6f16f96 100644
--- a/crypto/lz4hc.c
+++ b/crypto/lz4hc.c
@@ -65,15 +65,13 @@ static void lz4hc_exit(struct crypto_tfm *tfm)
static int __lz4hc_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_HC(src, dst, slen,
+ (int)((size_t)dlen), LZ4HC_DEFAULT_CLEVEL, ctx);
- err = lz4hc_compress(src, slen, dst, &tmp_len, ctx);
-
- if (err < 0)
+ if (out_len == 0)
return -EINVAL;
- *dlen = tmp_len;
+ *dlen = out_len;
return 0;
}
@@ -97,16 +95,13 @@ static int lz4hc_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
static int __lz4hc_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, (int)((size_t)dlen));
- err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
- if (err < 0)
+ if (out_len < 0)
return -EINVAL;
- *dlen = tmp_len;
- return err;
+ *dlen = out_len;
+ return out_len;
}
static int lz4hc_sdecompress(struct crypto_scomp *tfm, const u8 *src,
--
2.1.4
next prev parent reply other threads:[~2017-01-26 7:58 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1482259992-16680-1-git-send-email-4sschmid@informatik.uni-hamburg.de>
[not found] ` <1482259992-16680-2-git-send-email-4sschmid@informatik.uni-hamburg.de>
2016-12-22 13:25 ` [PATCH 1/3] crypto: Change lz4 modules to work with new lz4 compressor module version Sergey Senozhatsky
2017-01-07 16:55 ` [PATCH v2 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-07 16:55 ` [PATCH v2 1/4] lib: Update LZ4 compressor module based on LZ4 v1.7.2 Sven Schmidt
2017-01-08 11:22 ` Greg KH
2017-01-10 9:32 ` Sven Schmidt
2017-01-10 9:59 ` Greg KH
2017-01-08 11:25 ` Greg KH
2017-01-08 11:33 ` Rui Salvaterra
2017-01-10 9:21 ` Sven Schmidt
2017-01-10 10:00 ` Greg KH
2017-01-10 10:50 ` Willy Tarreau
2017-01-07 16:55 ` [PATCH v2 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-08 11:23 ` Greg KH
2017-01-07 16:55 ` [PATCH v2 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-07 16:55 ` [PATCH v2 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to comply " Sven Schmidt
2017-01-07 21:33 ` Kees Cook
2017-01-10 9:45 ` Sven Schmidt
2017-01-21 15:09 ` [PATCH v3 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-21 15:09 ` [PATCH 1/4] lib: " Sven Schmidt
2017-01-21 15:56 ` kbuild test robot
2017-01-21 16:16 ` kbuild test robot
2017-01-21 17:38 ` kbuild test robot
2017-01-22 11:05 ` Greg KH
2017-01-21 15:09 ` [PATCH 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-21 15:09 ` [PATCH 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-21 15:09 ` [PATCH 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 1/4] lib: " Sven Schmidt
2017-01-24 0:23 ` Andrew Morton
2017-01-24 16:48 ` Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 0/5] Update LZ4 compressor module Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 1/5] lib: " Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-26 7:57 ` Sven Schmidt [this message]
2017-01-26 7:57 ` [PATCH v5 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-01-26 9:19 ` [PATCH v5 0/5] Update LZ4 compressor module Eric Biggers
2017-01-26 14:15 ` Sven Schmidt
2017-01-27 22:01 ` [PATCH v6 " Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 1/5] lib: " Sven Schmidt
2017-01-31 22:27 ` Jonathan Corbet
2017-02-01 20:18 ` Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 0/5] Update LZ4 compressor module Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 1/5] lib: " Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-02-08 23:31 ` [PATCH v7 0/5] Update LZ4 compressor module Minchan Kim
2017-02-09 0:24 ` Eric Biggers
2017-02-09 5:24 ` Eric Biggers
2017-02-09 11:05 ` Sven Schmidt
2017-02-09 18:20 ` Eric Biggers
2017-02-10 0:14 ` Minchan Kim
2017-02-09 11:02 ` Sven Schmidt
2017-02-09 18:29 ` Eric Biggers
2017-02-10 3:57 ` David Miller
2017-02-09 10:56 ` Sven Schmidt
2017-02-10 0:13 ` Minchan Kim
2017-02-12 11:16 ` Sven Schmidt
2017-02-12 11:16 ` [PATCH] lz4: fix performance regressions Sven Schmidt
2017-02-12 13:05 ` Willy Tarreau
2017-02-12 15:20 ` Sven Schmidt
2017-02-12 21:41 ` Willy Tarreau
2017-02-13 11:53 ` Sven Schmidt
2017-02-13 13:37 ` Willy Tarreau
2017-02-12 23:38 ` Eric Biggers
2017-02-14 10:33 ` Sven Schmidt
2017-02-13 0:03 ` [PATCH v7 0/5] Update LZ4 compressor module Minchan Kim
2017-02-13 12:08 ` Sven Schmidt
2017-02-15 7:29 ` Minchan Kim
2017-02-15 18:16 ` [PATCH v8 " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 1/5] lib: " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485417455-31726-4-git-send-email-4sschmid@informatik.uni-hamburg.de \
--to=4sschmid@informatik.uni-hamburg.de \
--cc=akpm@linux-foundation.org \
--cc=anton@enomsg.org \
--cc=bongkyu.kim@lge.com \
--cc=ccross@android.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=keescook@chromium.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rsalvaterra@gmail.com \
--cc=sergey.senozhatsky@gmail.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).