qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: lzo: add a function to check the validity of the header 

Change-Id: I8835606db327dc958e90ce717ae4fe85439b46e3
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit d753f942ec12e6b5b2db73698aa6c55588053d3a)
This commit is contained in:
Jean-Jacques Hiblot 2017-09-15 12:57:28 +02:00 committed by Kever Yang
parent 0079efa1b4
commit df70772d8a
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/lzo.h
View File

@ -31,6 +31,9 @@ int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
int lzop_decompress(const unsigned char *src, size_t src_len, int lzop_decompress(const unsigned char *src, size_t src_len,
unsigned char *dst, size_t *dst_len); unsigned char *dst, size_t *dst_len);
/* check if the header is valid (based on magic numbers) */
bool lzop_is_valid_header(const unsigned char *src);
/* /*
* Return values (< 0 = Error) * Return values (< 0 = Error)
*/ */

23
lib/lzo/lzo1x_decompress.c
View File

@ -30,16 +30,29 @@ static const unsigned char lzop_magic[] = {
#define HEADER_HAS_FILTER 0x00000800L #define HEADER_HAS_FILTER 0x00000800L
bool lzop_is_valid_header(const unsigned char *src)
{
int i;
/* read magic: 9 first bytes */
for (i = 0; i < ARRAY_SIZE(lzop_magic); i++) {
if (*src++ != lzop_magic[i])
return false;
}
return true;
}
static inline const unsigned char *parse_header(const unsigned char *src) static inline const unsigned char *parse_header(const unsigned char *src)
{ {
u16 version; u16 version;
int i; int i;
/* read magic: 9 first bytes */ if (!lzop_is_valid_header(src))
for (i = 0; i < ARRAY_SIZE(lzop_magic); i++) { return NULL;
if (*src++ != lzop_magic[i])
return NULL; /* skip header */
} src += 9;
/* get version (2bytes), skip library version (2), /* get version (2bytes), skip library version (2),
* 'need to be extracted' version (2) and * 'need to be extracted' version (2) and
* method (1) */ * method (1) */