projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[linux-2.6-block.git]
/
crypto
/
lz4.c
diff --git
a/crypto/lz4.c
b/crypto/lz4.c
index 99c1b2cc2976ad31aca9cfef182bf0318b6e95af..71eff9b01b12296405f8d52a10f8427b3cbc5ca6 100644
(file)
--- 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)
{
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;
return -EINVAL;
- *dlen =
tmp
_len;
+ *dlen =
out
_len;
return 0;
}
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)
{
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,
}
static int lz4_sdecompress(struct crypto_scomp *tfm, const u8 *src,