sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LZMA: Add a version of ulzma which takes the input and output buffer sizes.

Browse Source 
This new version is used to implement the version which doesn't take the
input and output buffer sizes.

Old-Change-Id: I8935024aca0849bc939263d7fc3036c586e63c68
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65510
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 465d167ad2f6a67d0b2c91fb6c68c8f9a09dd395)

libpayload: Make lzma truncation non-fatal.

If the size the lzma header claims it needs is bigger than the space we have,
print a message and continue rather than erroring out. Apparently the encoder
is lazy sometimes and just puts a large value there regardless of what the
actual size is.

This was the original intention for this code, but an outdated version of the
patch ended up being submitted.

Old-Change-Id: Ibcf7ac0fd4b65ce85377421a4ee67b82d92d29d3
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/66235
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 30c628eeada274fc8b94f8f69f9df4f33cbfc773)

Squashed two related commits and updated the commit message to be
more clear.

Change-Id: I484b5c1e3809781033d146609a35a9e5e666c8ed
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6408
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Gabe Black
2013-08-10 09:35:56 -07:00
committed by Patrick Georgi
parent 586460b242
commit c1a20f0cb8
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
payloads/libpayload/include/lzma.h
View File

@@ -30,10 +30,18 @@
#ifndef _LZMA_H #ifndef _LZMA_H
#define _LZMA_H #define _LZMA_H
/* decompresses the data stream at src to dst, determining its length from /* Decompresses the data stream at src to dst. The sizes of the source and
* destination buffers are in srcn and dstn.
*
* Returns the decompressed size, or 0 on error
*/
unsigned long ulzman(const unsigned char *src, unsigned long srcn,
unsigned char *dst, unsigned long dstn);
/* Decompresses the data stream at src to dst, determining its length from
* the data stream itself. * the data stream itself.
* *
* returns the decompressed size, or 0 on error * Returns the decompressed size, or 0 on error
*/ */
unsigned long ulzma(const unsigned char *src, unsigned char *dst); unsigned long ulzma(const unsigned char *src, unsigned char *dst);

18
payloads/libpayload/liblzma/lzma.c
View File

@@ -14,9 +14,11 @@
#include <string.h> #include <string.h>
#include "lzmadecode.c" #include "lzmadecode.c"
unsigned long ulzma(const unsigned char * src, unsigned char * dst) unsigned long ulzman(const unsigned char *src, unsigned long srcn,
unsigned char *dst, unsigned long dstn)
{ {
unsigned char properties[LZMA_PROPERTIES_SIZE]; unsigned char properties[LZMA_PROPERTIES_SIZE];
const int data_offset = LZMA_PROPERTIES_SIZE + 8;
UInt32 outSize; UInt32 outSize;
SizeT inProcessed; SizeT inProcessed;
SizeT outProcessed; SizeT outProcessed;
@@ -27,7 +29,10 @@ unsigned long ulzma(const unsigned char * src, unsigned char * dst)
memcpy(properties, src, LZMA_PROPERTIES_SIZE); memcpy(properties, src, LZMA_PROPERTIES_SIZE);
memcpy(&outSize, src + LZMA_PROPERTIES_SIZE, sizeof(outSize)); memcpy(&outSize, src + LZMA_PROPERTIES_SIZE, sizeof(outSize));
if (LzmaDecodeProperties(&state.Properties, properties, LZMA_PROPERTIES_SIZE) != LZMA_RESULT_OK) { if (outSize > dstn)
outSize = dstn;
if (LzmaDecodeProperties(&state.Properties, properties,
LZMA_PROPERTIES_SIZE) != LZMA_RESULT_OK) {
printf("lzma: Incorrect stream properties.\n"); printf("lzma: Incorrect stream properties.\n");
return 0; return 0;
} }
@@ -37,11 +42,16 @@ unsigned long ulzma(const unsigned char * src, unsigned char * dst)
return 0; return 0;
} }
state.Probs = (CProb *)scratchpad; state.Probs = (CProb *)scratchpad;
res = LzmaDecode(&state, src + LZMA_PROPERTIES_SIZE + 8, (SizeT)0xffffffff, &inProcessed, res = LzmaDecode(&state, src + data_offset, srcn - data_offset,
dst, outSize, &outProcessed); &inProcessed, dst, outSize, &outProcessed);
if (res != 0) { if (res != 0) {
printf("lzma: Decoding error = %d\n", res); printf("lzma: Decoding error = %d\n", res);
return 0; return 0;
} }
return outSize; return outSize;
} }
unsigned long ulzma(const unsigned char *src, unsigned char *dst)
{
return ulzman(src, (unsigned long)(-1), dst, (unsigned long)(-1));
}