bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/decompress_unlz4: change module to work with new LZ4 module version

Browse source 
Update the unlz4 wrapper to work with the updated LZ4 kernel module
version.

Link: http://lkml.kernel.org/r/1486321748-19085-3-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>
This commit is contained in:
Sven Schmidt 2017-02-24 15:01:16 -08:00 • committed by Linus Torvalds
parent 4e1a33b105
commit e23d54e483
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/decompress_unlz4.c
View file

@ -72,7 +72,7 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
error("NULL input pointer and missing fill function"); error("NULL input pointer and missing fill function");
goto exit_1; goto exit_1;
} else { } else {
inp = large_malloc(lz4_compressbound(uncomp_chunksize)); inp = large_malloc(LZ4_compressBound(uncomp_chunksize));
if (!inp) { if (!inp) {
error("Could not allocate input buffer"); error("Could not allocate input buffer");
goto exit_1; goto exit_1;
@ -136,7 +136,7 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
inp += 4; inp += 4;
size -= 4; size -= 4;
} else { } else {
if (chunksize > lz4_compressbound(uncomp_chunksize)) { if (chunksize > LZ4_compressBound(uncomp_chunksize)) {
error("chunk length is longer than allocated"); error("chunk length is longer than allocated");
goto exit_2; goto exit_2;
} }
@ -152,11 +152,14 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
out_len -= dest_len; out_len -= dest_len;
} else } else
dest_len = out_len; dest_len = out_len;
ret = lz4_decompress(inp, &chunksize, outp, dest_len);
ret = LZ4_decompress_fast(inp, outp, dest_len);
chunksize = ret;
#else #else
dest_len = uncomp_chunksize; dest_len = uncomp_chunksize;
ret = lz4_decompress_unknownoutputsize(inp, chunksize, outp,
&dest_len); ret = LZ4_decompress_safe(inp, outp, chunksize, dest_len);
dest_len = ret;
#endif #endif
if (ret < 0) { if (ret < 0) {
error("Decoding failed"); error("Decoding failed");