sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

ubifs: Fix ubifsload when using ZLIB 

Using ZLIB compression with UBIFS fails if last data node is not a size of
UBIFS_BLOCK_SIZE (4096 bytes).

Easiest way to test this is trying to read a file smaller than 4k:
=> ubifsload 41000000 /etc/fstab
Loading file '/etc/fstab' to addr 0x41000000 with size 704 (0x000002c0)...
UBIFS error (pid 0): read_block: bad data node (block 0, inode 2506)
UBIFS error (pid 0): do_readpage: cannot read page 0 of inode 2506, error -22
Error reading file '/etc/fstab'
/etc/fstab not found!
exit not allowed from main input shell.
=>

With this patch:

=> ubifsload 41000000 /etc/fstab
Loading file '/etc/fstab' to addr 0x41000000 with size 704 (0x000002c0)...
Done
=>

Signed-off-by: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Cc: kmpark@infradead.org
Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Veli-Pekka Peltola 2012-09-05 18:05:14 +03:00 committed by Stefan Roese
parent a6f0c4faa4
commit 8044c1387f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ubifs/ubifs.c
View File

@ -37,8 +37,8 @@ DECLARE_GLOBAL_DATA_PTR;
static int gzip_decompress(const unsigned char *in, size_t in_len,
unsigned char *out, size_t *out_len)
{
unsigned long len = in_len;
return zunzip(out, *out_len, (unsigned char *)in, &len, 0, 0);
return zunzip(out, *out_len, (unsigned char *)in,
(unsigned long *)out_len, 0, 0);
}
/* Fake description object for the "none" compressor */