vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/fs/squash4.c (grub_squash_inode): Fix offset field.

Browse source 
(grub_squash_read_data): Fix offset byte-swapping.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-04 17:13:24 +02:00
parent ce41ab7aab
commit 6f5d5ee865
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-04 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/squash4.c (grub_squash_inode): Fix offset field.
(grub_squash_read_data): Fix offset byte-swapping.
2012-05-04 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-04 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/misc.c (grub_strcmp): Use unsigned comparison as * grub-core/kern/misc.c (grub_strcmp): Use unsigned comparison as

8
grub-core/fs/squash4.c
View file

@ -86,8 +86,7 @@ struct grub_squash_inode
struct { struct {
grub_uint32_t chunk; grub_uint32_t chunk;
grub_uint32_t fragment; grub_uint32_t fragment;
grub_uint16_t offset; grub_uint32_t offset;
grub_uint16_t dummy;
grub_uint32_t size; grub_uint32_t size;
grub_uint32_t block_size[0]; grub_uint32_t block_size[0];
} __attribute__ ((packed)) file; } __attribute__ ((packed)) file;
@ -96,8 +95,7 @@ struct grub_squash_inode
grub_uint64_t size; grub_uint64_t size;
grub_uint32_t dummy1[3]; grub_uint32_t dummy1[3];
grub_uint32_t fragment; grub_uint32_t fragment;
grub_uint16_t offset; grub_uint32_t offset;
grub_uint16_t dummy2;
grub_uint32_t dummy3; grub_uint32_t dummy3;
grub_uint32_t block_size[0]; grub_uint32_t block_size[0];
} __attribute__ ((packed)) long_file; } __attribute__ ((packed)) long_file;
@ -860,7 +858,7 @@ grub_squash_read_data (struct grub_squash_data *data,
a += grub_le_to_cpu64 (frag.offset); a += grub_le_to_cpu64 (frag.offset);
compressed = !(frag.size & SQUASH_BLOCK_UNCOMPRESSED); compressed = !(frag.size & SQUASH_BLOCK_UNCOMPRESSED);
if (ino->ino.type == grub_cpu_to_le16_compile_time (SQUASH_TYPE_LONG_REGULAR)) if (ino->ino.type == grub_cpu_to_le16_compile_time (SQUASH_TYPE_LONG_REGULAR))
b = grub_le_to_cpu64 (ino->ino.long_file.offset) + off; b = grub_le_to_cpu32 (ino->ino.long_file.offset) + off;
else else
b = grub_le_to_cpu32 (ino->ino.file.offset) + off; b = grub_le_to_cpu32 (ino->ino.file.offset) + off;