Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 14:25:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/lz4: update LZ4 decompressor module

Browse source 
Update the LZ4 compression module based on LZ4 v1.8.3 in order to
use the newest LZ4_decompress_safe_partial() which can now decode
exactly the nb of bytes requested.

Signed-off-by: Huang Jianan <jnhuang95@gmail.com>
This commit is contained in:
Huang Jianan 2022-02-26 15:05:48 +08:00 • committed by Tom Rini
parent 830613f8f5
commit 26c7fdadcb
3 changed files with 519 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
include/u-boot/lz4.h
View file

@ -21,4 +21,53 @@
*/ */
int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn); int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn);
/**
* LZ4_decompress_safe() - Decompression protected against buffer overflow
* @source: source address of the compressed data
* @dest: output buffer address of the uncompressed data
* which must be already allocated
* @compressedSize: is the precise full size of the compressed block
* @maxDecompressedSize: is the size of 'dest' buffer
*
* Decompresses data from 'source' into 'dest'.
* If the source stream is detected malformed, the function will
* stop decoding and return a negative result.
* This function is protected against buffer overflow exploits,
* including malicious data packets. It never writes outside output buffer,
* nor reads outside input buffer.
*
* Return: number of bytes decompressed into destination buffer
* (necessarily <= maxDecompressedSize)
* or a negative result in case of error
*/
int LZ4_decompress_safe(const char *source, char *dest,
int compressedSize, int maxDecompressedSize);
/**
* LZ4_decompress_safe_partial() - Decompress a block of size 'compressedSize'
* at position 'source' into buffer 'dest'
* @source: source address of the compressed data
* @dest: output buffer address of the decompressed data which must be
* already allocated
* @compressedSize: is the precise full size of the compressed block.
* @targetOutputSize: the decompression operation will try
* to stop as soon as 'targetOutputSize' has been reached
* @maxDecompressedSize: is the size of destination buffer
*
* This function decompresses a compressed block of size 'compressedSize'
* at position 'source' into destination buffer 'dest'
* of size 'maxDecompressedSize'.
* The function tries to stop decompressing operation as soon as
* 'targetOutputSize' has been reached, reducing decompression time.
* This function never writes outside of output buffer,
* and never reads outside of input buffer.
* It is therefore protected against malicious data packets.
*
* Return: the number of bytes decoded in the destination buffer
* (necessarily <= maxDecompressedSize)
* or a negative result in case of error
*
*/
int LZ4_decompress_safe_partial(const char *src, char *dst,
int compressedSize, int targetOutputSize, int dstCapacity);
#endif #endif

645
lib/lz4.c
View file

@ -1,13 +1,63 @@
// SPDX-License-Identifier: BSD-2-Clause // SPDX-License-Identifier: GPL 2.0+ OR BSD-2-Clause
/* /*
LZ4 - Fast LZ compression algorithm * LZ4 - Fast LZ compression algorithm
Copyright (C) 2011-2015, Yann Collet. * Copyright (C) 2011 - 2016, Yann Collet.
* BSD 2 - Clause License (http://www.opensource.org/licenses/bsd - license.php)
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* You can contact the author at :
* - LZ4 homepage : http://www.lz4.org
* - LZ4 source repository : https://github.com/lz4/lz4
*/
#include <common.h>
#include <compiler.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/bug.h>
#include <asm/unaligned.h>
#include <u-boot/lz4.h>
You can contact the author at : #define FORCE_INLINE inline __attribute__((always_inline))
- LZ4 source repository : https://github.com/Cyan4973/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
static FORCE_INLINE u16 LZ4_readLE16(const void *src)
{
return get_unaligned_le16(src);
}
static FORCE_INLINE void LZ4_copy8(void *dst, const void *src)
{
put_unaligned(get_unaligned((const u64 *)src), (u64 *)dst);
}
typedef uint8_t BYTE;
typedef uint16_t U16;
typedef uint32_t U32;
typedef int32_t S32;
typedef uint64_t U64;
typedef uintptr_t uptrval;
static FORCE_INLINE void LZ4_write32(void *memPtr, U32 value)
{
put_unaligned(value, (U32 *)memPtr);
}
/************************************** /**************************************
* Reading and writing into memory * Reading and writing into memory
@ -28,14 +78,17 @@ static void LZ4_wildCopy(void* dstPtr, const void* srcPtr, void* dstEnd)
**************************************/ **************************************/
#define MINMATCH 4 #define MINMATCH 4
#define COPYLENGTH 8 #define WILDCOPYLENGTH 8
#define LASTLITERALS 5 #define LASTLITERALS 5
#define MFLIMIT (COPYLENGTH+MINMATCH) #define MFLIMIT (WILDCOPYLENGTH + MINMATCH)
static const int LZ4_minLength = (MFLIMIT+1);
#define KB *(1 <<10) /*
#define MB *(1 <<20) * ensure it's possible to write 2 x wildcopyLength
#define GB *(1U<<30) * without overflowing output buffer
*/
#define MATCH_SAFEGUARD_DISTANCE ((2 * WILDCOPYLENGTH) - MINMATCH)
#define KB (1 <<10)
#define MAXD_LOG 16 #define MAXD_LOG 16
#define MAX_DISTANCE ((1 << MAXD_LOG) - 1) #define MAX_DISTANCE ((1 << MAXD_LOG) - 1)
@ -45,198 +98,438 @@ static const int LZ4_minLength = (MFLIMIT+1);
#define RUN_BITS (8-ML_BITS) #define RUN_BITS (8-ML_BITS)
#define RUN_MASK ((1U<<RUN_BITS)-1) #define RUN_MASK ((1U<<RUN_BITS)-1)
#define LZ4_STATIC_ASSERT(c) BUILD_BUG_ON(!(c))
/************************************** /**************************************
* Local Structures and types * Local Structures and types
**************************************/ **************************************/
typedef enum { noDict = 0, withPrefix64k, usingExtDict } dict_directive; typedef enum { noDict = 0, withPrefix64k, usingExtDict } dict_directive;
typedef enum { endOnOutputSize = 0, endOnInputSize = 1 } endCondition_directive; typedef enum { endOnOutputSize = 0, endOnInputSize = 1 } endCondition_directive;
typedef enum { full = 0, partial = 1 } earlyEnd_directive; typedef enum { decode_full_block = 0, partial_decode = 1 } earlyEnd_directive;
#define DEBUGLOG(l, ...) {} /* disabled */
#ifndef assert
#define assert(condition) ((void)0)
#endif
/*******************************
* Decompression functions
*******************************/
/* /*
* This generic decompression function cover all use cases. * LZ4_decompress_generic() :
* It shall be instantiated several times, using different sets of directives * This generic decompression function covers all use cases.
* Note that it is essential this generic function is really inlined, * It shall be instantiated several times, using different sets of directives.
* Note that it is important for performance that this function really get inlined,
* in order to remove useless branches during compilation optimization. * in order to remove useless branches during compilation optimization.
*/ */
FORCE_INLINE int LZ4_decompress_generic( static FORCE_INLINE int LZ4_decompress_generic(
const char* const source, const char * const src,
char* const dest, char * const dst,
int inputSize, int srcSize,
int outputSize, /* If endOnInput==endOnInputSize, this value is the max size of Output Buffer. */ /*
* If endOnInput == endOnInputSize,
int endOnInput, /* endOnOutputSize, endOnInputSize */ * this value is `dstCapacity`
int partialDecoding, /* full, partial */ */
int targetOutputSize, /* only used if partialDecoding==partial */ int outputSize,
int dict, /* noDict, withPrefix64k, usingExtDict */ /* endOnOutputSize, endOnInputSize */
const BYTE* const lowPrefix, /* == dest if dict == noDict */ endCondition_directive endOnInput,
const BYTE* const dictStart, /* only if dict==usingExtDict */ /* full, partial */
const size_t dictSize /* note : = 0 if noDict */ earlyEnd_directive partialDecoding,
) /* noDict, withPrefix64k, usingExtDict */
dict_directive dict,
/* always <= dst, == dst when no prefix */
const BYTE * const lowPrefix,
/* only if dict == usingExtDict */
const BYTE * const dictStart,
/* note : = 0 if noDict */
const size_t dictSize
)
{ {
/* Local Variables */ const BYTE *ip = (const BYTE *) src;
const BYTE* ip = (const BYTE*) source; const BYTE * const iend = ip + srcSize;
const BYTE* const iend = ip + inputSize;
BYTE* op = (BYTE*) dest; BYTE *op = (BYTE *) dst;
BYTE* const oend = op + outputSize; BYTE * const oend = op + outputSize;
BYTE* cpy; BYTE *cpy;
BYTE* oexit = op + targetOutputSize;
const BYTE* const lowLimit = lowPrefix - dictSize;
const BYTE* const dictEnd = (const BYTE*)dictStart + dictSize; const BYTE * const dictEnd = (const BYTE *)dictStart + dictSize;
const size_t dec32table[] = {4, 1, 2, 1, 4, 4, 4, 4}; static const unsigned int inc32table[8] = {0, 1, 2, 1, 0, 4, 4, 4};
const size_t dec64table[] = {0, 0, 0, (size_t)-1, 0, 1, 2, 3}; static const int dec64table[8] = {0, 0, 0, -1, -4, 1, 2, 3};
const int safeDecode = (endOnInput==endOnInputSize); const int safeDecode = (endOnInput == endOnInputSize);
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB))); const int checkOffset = ((safeDecode) && (dictSize < (int)(64 * KB)));
/* Set up the "end" pointers for the shortcut. */
const BYTE *const shortiend = iend -
(endOnInput ? 14 : 8) /*maxLL*/ - 2 /*offset*/;
const BYTE *const shortoend = oend -
(endOnInput ? 14 : 8) /*maxLL*/ - 18 /*maxML*/;
/* Special cases */ DEBUGLOG(5, "%s (srcSize:%i, dstSize:%i)", __func__,
if ((partialDecoding) && (oexit> oend-MFLIMIT)) oexit = oend-MFLIMIT; /* targetOutputSize too high => decode everything */ srcSize, outputSize);
if ((endOnInput) && (unlikely(outputSize==0))) return ((inputSize==1) && (*ip==0)) ? 0 : -1; /* Empty output buffer */
if ((!endOnInput) && (unlikely(outputSize==0))) return (*ip==0?1:-1);
/* Special cases */
assert(lowPrefix <= op);
assert(src != NULL);
/* Main Loop */ /* Empty output buffer */
while (1) if ((endOnInput) && (unlikely(outputSize == 0)))
{ return ((srcSize == 1) && (*ip == 0)) ? 0 : -1;
unsigned token;
size_t length;
const BYTE* match;
/* get literal length */ if ((!endOnInput) && (unlikely(outputSize == 0)))
token = *ip++; return (*ip == 0 ? 1 : -1);
if ((length=(token>>ML_BITS)) == RUN_MASK)
{
unsigned s;
do
{
s = *ip++;
length += s;
}
while (likely((endOnInput)?ip<iend-RUN_MASK:1) && (s==255));
if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)(op))) goto _output_error; /* overflow detection */
if ((safeDecode) && unlikely((size_t)(ip+length)<(size_t)(ip))) goto _output_error; /* overflow detection */
}
/* copy literals */ if ((endOnInput) && unlikely(srcSize == 0))
cpy = op+length; return -1;
if (((endOnInput) && ((cpy>(partialDecoding?oexit:oend-MFLIMIT)) || (ip+length>iend-(2+1+LASTLITERALS))) )
|| ((!endOnInput) && (cpy>oend-COPYLENGTH)))
{
if (partialDecoding)
{
if (cpy > oend) goto _output_error; /* Error : write attempt beyond end of output buffer */
if ((endOnInput) && (ip+length > iend)) goto _output_error; /* Error : read attempt beyond end of input buffer */
}
else
{
if ((!endOnInput) && (cpy != oend)) goto _output_error; /* Error : block decoding must stop exactly there */
if ((endOnInput) && ((ip+length != iend) || (cpy > oend))) goto _output_error; /* Error : input must be consumed */
}
memcpy(op, ip, length);
ip += length;
op += length;
break; /* Necessarily EOF, due to parsing restrictions */
}
LZ4_wildCopy(op, ip, cpy);
ip += length; op = cpy;
/* get offset */ /* Main Loop : decode sequences */
match = cpy - LZ4_readLE16(ip); ip+=2; while (1) {
if ((checkOffset) && (unlikely(match < lowLimit))) goto _output_error; /* Error : offset outside destination buffer */ size_t length;
const BYTE *match;
size_t offset;
/* get matchlength */ /* get literal length */
length = token & ML_MASK; unsigned int const token = *ip++;
if (length == ML_MASK) length = token>>ML_BITS;
{
unsigned s;
do
{
if ((endOnInput) && (ip > iend-LASTLITERALS)) goto _output_error;
s = *ip++;
length += s;
} while (s==255);
if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)op)) goto _output_error; /* overflow detection */
}
length += MINMATCH;
/* check external dictionary */ /* ip < iend before the increment */
if ((dict==usingExtDict) && (match < lowPrefix)) assert(!endOnInput || ip <= iend);
{
if (unlikely(op+length > oend-LASTLITERALS)) goto _output_error; /* doesn't respect parsing restriction */
if (length <= (size_t)(lowPrefix-match)) /*
{ * A two-stage shortcut for the most common case:
/* match can be copied as a single segment from external dictionary */ * 1) If the literal length is 0..14, and there is enough
match = dictEnd - (lowPrefix-match); * space, enter the shortcut and copy 16 bytes on behalf
memmove(op, match, length); op += length; * of the literals (in the fast mode, only 8 bytes can be
} * safely copied this way).
else * 2) Further if the match length is 4..18, copy 18 bytes
{ * in a similar manner; but we ensure that there's enough
/* match encompass external dictionary and current segment */ * space in the output for those 18 bytes earlier, upon
size_t copySize = (size_t)(lowPrefix-match); * entering the shortcut (in other words, there is a
memcpy(op, dictEnd - copySize, copySize); * combined check for both stages).
op += copySize; *
copySize = length - copySize; * The & in the likely() below is intentionally not && so that
if (copySize > (size_t)(op-lowPrefix)) /* overlap within current segment */ * some compilers can produce better parallelized runtime code
{ */
BYTE* const endOfMatch = op + copySize; if ((endOnInput ? length != RUN_MASK : length <= 8)
const BYTE* copyFrom = lowPrefix; /*
while (op < endOfMatch) *op++ = *copyFrom++; * strictly "less than" on input, to re-enter
} * the loop with at least one byte
else */
{ && likely((endOnInput ? ip < shortiend : 1) &
memcpy(op, lowPrefix, copySize); (op <= shortoend))) {
op += copySize; /* Copy the literals */
} memcpy(op, ip, endOnInput ? 16 : 8);
} op += length; ip += length;
continue;
}
/* copy repeated sequence */ /*
cpy = op + length; * The second stage:
if (unlikely((op-match)<8)) * prepare for match copying, decode full info.
{ * If it doesn't work out, the info won't be wasted.
const size_t dec64 = dec64table[op-match]; */
op[0] = match[0]; length = token & ML_MASK; /* match length */
op[1] = match[1]; offset = LZ4_readLE16(ip);
op[2] = match[2]; ip += 2;
op[3] = match[3]; match = op - offset;
match += dec32table[op-match]; assert(match <= op); /* check overflow */
LZ4_copy4(op+4, match);
op += 8; match -= dec64;
} else { LZ4_copy8(op, match); op+=8; match+=8; }
if (unlikely(cpy>oend-12)) /* Do not deal with overlapping matches. */
{ if ((length != ML_MASK) &&
if (cpy > oend-LASTLITERALS) goto _output_error; /* Error : last LASTLITERALS bytes must be literals */ (offset >= 8) &&
if (op < oend-8) (dict == withPrefix64k || match >= lowPrefix)) {
{ /* Copy the match. */
LZ4_wildCopy(op, match, oend-8); memcpy(op + 0, match + 0, 8);
match += (oend-8) - op; memcpy(op + 8, match + 8, 8);
op = oend-8; memcpy(op + 16, match + 16, 2);
} op += length + MINMATCH;
while (op<cpy) *op++ = *match++; /* Both stages worked, load the next token. */
} continue;
else }
LZ4_wildCopy(op, match, cpy);
op=cpy; /* correction */
}
/* end of decoding */ /*
if (endOnInput) * The second stage didn't work out, but the info
return (int) (((char*)op)-dest); /* Nb of output bytes decoded */ * is ready. Propel it right to the point of match
else * copying.
return (int) (((const char*)ip)-source); /* Nb of input bytes read */ */
goto _copy_match;
}
/* Overflow error detected */ /* decode literal length */
if (length == RUN_MASK) {
unsigned int s;
if (unlikely(endOnInput ? ip >= iend - RUN_MASK : 0)) {
/* overflow detection */
goto _output_error;
}
do {
s = *ip++;
length += s;
} while (likely(endOnInput
? ip < iend - RUN_MASK
: 1) & (s == 255));
if ((safeDecode)
&& unlikely((uptrval)(op) +
length < (uptrval)(op))) {
/* overflow detection */
goto _output_error;
}
if ((safeDecode)
&& unlikely((uptrval)(ip) +
length < (uptrval)(ip))) {
/* overflow detection */
goto _output_error;
}
}
/* copy literals */
cpy = op + length;
LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH);
if (((endOnInput) && ((cpy > oend - MFLIMIT)
|| (ip + length > iend - (2 + 1 + LASTLITERALS))))
|| ((!endOnInput) && (cpy > oend - WILDCOPYLENGTH))) {
if (partialDecoding) {
if (cpy > oend) {
/*
* Partial decoding :
* stop in the middle of literal segment
*/
cpy = oend;
length = oend - op;
}
if ((endOnInput)
&& (ip + length > iend)) {
/*
* Error :
* read attempt beyond
* end of input buffer
*/
goto _output_error;
}
} else {
if ((!endOnInput)
&& (cpy != oend)) {
/*
* Error :
* block decoding must
* stop exactly there
*/
goto _output_error;
}
if ((endOnInput)
&& ((ip + length != iend)
|| (cpy > oend))) {
/*
* Error :
* input must be consumed
*/
goto _output_error;
}
}
/*
* supports overlapping memory regions; only matters
* for in-place decompression scenarios
*/
memmove(op, ip, length);
ip += length;
op += length;
/* Necessarily EOF, due to parsing restrictions */
if (!partialDecoding || (cpy == oend))
break;
} else {
/* may overwrite up to WILDCOPYLENGTH beyond cpy */
LZ4_wildCopy(op, ip, cpy);
ip += length;
op = cpy;
}
/* get offset */
offset = LZ4_readLE16(ip);
ip += 2;
match = op - offset;
/* get matchlength */
length = token & ML_MASK;
_copy_match:
if ((checkOffset) && (unlikely(match + dictSize < lowPrefix))) {
/* Error : offset outside buffers */
goto _output_error;
}
/* costs ~1%; silence an msan warning when offset == 0 */
/*
* note : when partialDecoding, there is no guarantee that
* at least 4 bytes remain available in output buffer
*/
if (!partialDecoding) {
assert(oend > op);
assert(oend - op >= 4);
LZ4_write32(op, (U32)offset);
}
if (length == ML_MASK) {
unsigned int s;
do {
s = *ip++;
if ((endOnInput) && (ip > iend - LASTLITERALS))
goto _output_error;
length += s;
} while (s == 255);
if ((safeDecode)
&& unlikely(
(uptrval)(op) + length < (uptrval)op)) {
/* overflow detection */
goto _output_error;
}
}
length += MINMATCH;
/* match starting within external dictionary */
if ((dict == usingExtDict) && (match < lowPrefix)) {
if (unlikely(op + length > oend - LASTLITERALS)) {
/* doesn't respect parsing restriction */
if (!partialDecoding)
goto _output_error;
length = min(length, (size_t)(oend - op));
}
if (length <= (size_t)(lowPrefix - match)) {
/*
* match fits entirely within external
* dictionary : just copy
*/
memmove(op, dictEnd - (lowPrefix - match),
length);
op += length;
} else {
/*
* match stretches into both external
* dictionary and current block
*/
size_t const copySize = (size_t)(lowPrefix - match);
size_t const restSize = length - copySize;
memcpy(op, dictEnd - copySize, copySize);
op += copySize;
if (restSize > (size_t)(op - lowPrefix)) {
/* overlap copy */
BYTE * const endOfMatch = op + restSize;
const BYTE *copyFrom = lowPrefix;
while (op < endOfMatch)
*op++ = *copyFrom++;
} else {
memcpy(op, lowPrefix, restSize);
op += restSize;
}
}
continue;
}
/* copy match within block */
cpy = op + length;
/*
* partialDecoding :
* may not respect endBlock parsing restrictions
*/
assert(op <= oend);
if (partialDecoding &&
(cpy > oend - MATCH_SAFEGUARD_DISTANCE)) {
size_t const mlen = min(length, (size_t)(oend - op));
const BYTE * const matchEnd = match + mlen;
BYTE * const copyEnd = op + mlen;
if (matchEnd > op) {
/* overlap copy */
while (op < copyEnd)
*op++ = *match++;
} else {
memcpy(op, match, mlen);
}
op = copyEnd;
if (op == oend)
break;
continue;
}
if (unlikely(offset < 8)) {
op[0] = match[0];
op[1] = match[1];
op[2] = match[2];
op[3] = match[3];
match += inc32table[offset];
memcpy(op + 4, match, 4);
match -= dec64table[offset];
} else {
LZ4_copy8(op, match);
match += 8;
}
op += 8;
if (unlikely(cpy > oend - MATCH_SAFEGUARD_DISTANCE)) {
BYTE * const oCopyLimit = oend - (WILDCOPYLENGTH - 1);
if (cpy > oend - LASTLITERALS) {
/*
* Error : last LASTLITERALS bytes
* must be literals (uncompressed)
*/
goto _output_error;
}
if (op < oCopyLimit) {
LZ4_wildCopy(op, match, oCopyLimit);
match += oCopyLimit - op;
op = oCopyLimit;
}
while (op < cpy)
*op++ = *match++;
} else {
LZ4_copy8(op, match);
if (length > 16)
LZ4_wildCopy(op + 8, match + 8, cpy);
}
op = cpy; /* wildcopy correction */
}
/* end of decoding */
if (endOnInput) {
/* Nb of output bytes decoded */
return (int) (((char *)op) - dst);
} else {
/* Nb of input bytes read */
return (int) (((const char *)ip) - src);
}
/* Overflow error detected */
_output_error: _output_error:
return (int) (-(((const char*)ip)-source))-1; return (int) (-(((const char *)ip) - src)) - 1;
}
int LZ4_decompress_safe(const char *source, char *dest,
int compressedSize, int maxDecompressedSize)
{
return LZ4_decompress_generic(source, dest,
compressedSize, maxDecompressedSize,
endOnInputSize, decode_full_block,
noDict, (BYTE *)dest, NULL, 0);
}
int LZ4_decompress_safe_partial(const char *src, char *dst,
int compressedSize, int targetOutputSize, int dstCapacity)
{
dstCapacity = min(targetOutputSize, dstCapacity);
return LZ4_decompress_generic(src, dst, compressedSize, dstCapacity,
endOnInputSize, partial_decode,
noDict, (BYTE *)dst, NULL, 0);
} }

23
lib/lz4_wrapper.c
View file

@ -11,27 +11,6 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <u-boot/lz4.h> #include <u-boot/lz4.h>
static u16 LZ4_readLE16(const void *src)
{
return get_unaligned_le16(src);
}
static void LZ4_copy4(void *dst, const void *src)
{
put_unaligned(get_unaligned((const u32 *)src), (u32 *)dst);
}
static void LZ4_copy8(void *dst, const void *src)
{
put_unaligned(get_unaligned((const u64 *)src), (u64 *)dst);
}
typedef uint8_t BYTE;
typedef uint16_t U16;
typedef uint32_t U32;
typedef int32_t S32;
typedef uint64_t U64;
#define FORCE_INLINE static inline __attribute__((always_inline))
/* lz4.c is unaltered (except removing unrelated code) from github.com/Cyan4973/lz4. */ /* lz4.c is unaltered (except removing unrelated code) from github.com/Cyan4973/lz4. */
#include "lz4.c" /* #include for inlining, do not link! */ #include "lz4.c" /* #include for inlining, do not link! */
@ -112,7 +91,7 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn)
/* constant folding essential, do not touch params! */ /* constant folding essential, do not touch params! */
ret = LZ4_decompress_generic(in, out, block_size, ret = LZ4_decompress_generic(in, out, block_size,
end - out, endOnInputSize, end - out, endOnInputSize,
full, 0, noDict, out, NULL, 0); decode_full_block, noDict, out, NULL, 0);
if (ret < 0) { if (ret < 0) {
ret = -EPROTO; /* decompression error */ ret = -EPROTO; /* decompression error */
break; break;