summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorVeli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>2012-09-05 18:05:14 +0300
committerStefan Roese <sr@denx.de>2012-09-10 11:37:42 +0200
commit8044c1387f7f8acb2a82f64f1b087848395deb15 (patch)
treedc90196320ef468c7b14c32b01c88e06eb051ded /fs
parenta6f0c4faa4c65a7b7048b12c9d180d7e1aad1721 (diff)
downloadtalos-obmc-uboot-8044c1387f7f8acb2a82f64f1b087848395deb15.tar.gz
talos-obmc-uboot-8044c1387f7f8acb2a82f64f1b087848395deb15.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/ubifs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index c68802bc8d..44be3f53e0 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -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 */
OpenPOWER on IntegriCloud