Skip to contentSkip to conversation

ubifs: Fix ubifsload when using ZLIB

PATCH New Veli-Pekka Peltola 3 participants 3 messages Sep 5, 2012 – Sep 10, 2012 UBI file system (UBIFS)

lore
Share & tools
lore

Veli-Pekka Peltola

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>
Cc kmpark at infradead.org

---
Changes for v2: use proper variable type

 fs/ubifs/ubifs.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ubifs/ubifs.c +1 -2
index c68802b..d241774 100644
@@ -37,8 +37,7 @@ 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 */
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 ubifs: Fix ubifsload when using ZLIB

Quoted 15 lines · Veli-Pekka Peltola

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:

Quoted 7 lines

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

Signed-off-by Veli-Pekka Peltola <[email protected]>
Cc kmpark at infradead.org
Tested-by Andreas Bie?mann <[email protected]>
#2 lore raw

PATCH v2 1/1 ubifs: Fix ubifsload when using ZLIB

In reply to Veli-Pekka Peltola
Quoted 13 lines · Veli-Pekka Peltola

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.
=>

Quoted 6 lines

With this patch:

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

Thanks for this fix.

Applied to u-boot-ubi/master after minor coding style fix (line over 80 chars).

Thanks,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de