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

Fix exfat endianness handling.

Browse source 
* grub-core/fs/fat.c (grub_fat_data): Make fat_sector 32-bit.
	(grub_fat_mount) [MODE_EXFAT]: Fix bpb.num_reserved_sectors byte-swap.
	(grub_fat_iterate_dir) [MODE_EXFAT]: Fix attr byte-swap.
	Byte-swap utf16 when necessary.
	(grub_fat_label) [MODE_EXFAT]: Byte-swap utf16 when necessary.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-31 19:04:13 +02:00
parent bbb39a458b
commit d73ff15de4
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2012-03-31 Vladimir Serbinenko <phcoder@gmail.com>
Fix exfat endianness handling.
* grub-core/fs/fat.c (grub_fat_data): Make fat_sector 32-bit.
(grub_fat_mount) [MODE_EXFAT]: Fix bpb.num_reserved_sectors byte-swap.
(grub_fat_iterate_dir) [MODE_EXFAT]: Fix attr byte-swap.
Byte-swap utf16 when necessary.
(grub_fat_label) [MODE_EXFAT]: Byte-swap utf16 when necessary.
2012-03-31 Anton Blanchard <anton@samba.org> 2012-03-31 Anton Blanchard <anton@samba.org>
2012-03-31 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-31 Vladimir Serbinenko <phcoder@gmail.com>

26
grub-core/fs/fat.c
View file

@ -178,7 +178,7 @@ struct grub_fat_data
int logical_sector_bits; int logical_sector_bits;
grub_uint32_t num_sectors; grub_uint32_t num_sectors;
grub_uint16_t fat_sector; grub_uint32_t fat_sector;
grub_uint32_t sectors_per_fat; grub_uint32_t sectors_per_fat;
int fat_size; int fat_size;
@ -269,8 +269,13 @@ grub_fat_mount (grub_disk_t disk)
data->cluster_bits += data->logical_sector_bits; data->cluster_bits += data->logical_sector_bits;
/* Get information about FATs. */ /* Get information about FATs. */
#ifdef MODE_EXFAT
data->fat_sector = (grub_le_to_cpu32 (bpb.num_reserved_sectors)
<< data->logical_sector_bits);
#else
data->fat_sector = (grub_le_to_cpu16 (bpb.num_reserved_sectors) data->fat_sector = (grub_le_to_cpu16 (bpb.num_reserved_sectors)
<< data->logical_sector_bits); << data->logical_sector_bits);
#endif
if (data->fat_sector == 0) if (data->fat_sector == 0)
goto fail; goto fail;
@ -607,7 +612,7 @@ grub_fat_iterate_dir (grub_disk_t disk, struct grub_fat_data *data,
nsec = dir.type_specific.file.secondary_count; nsec = dir.type_specific.file.secondary_count;
node.attr = grub_cpu_to_le32 (dir.type_specific.file.attr); node.attr = grub_cpu_to_le16 (dir.type_specific.file.attr);
node.have_stream = 0; node.have_stream = 0;
for (i = 0; i < nsec; i++) for (i = 0; i < nsec; i++)
{ {
@ -632,9 +637,13 @@ grub_fat_iterate_dir (grub_disk_t disk, struct grub_fat_data *data,
node.have_stream = 1; node.have_stream = 1;
break; break;
case 0xc1: case 0xc1:
grub_memcpy (unibuf + slots * 15, {
sec.type_specific.file_name.str, 30); int j;
slots++; for (j = 0; j < 15; j++)
unibuf[slots * 15 + j]
= grub_le_to_cpu16 (sec.type_specific.file_name.str[j]);
slots++;
}
break; break;
default: default:
grub_dprintf ("exfat", "unknown secondary type 0x%02x\n", grub_dprintf ("exfat", "unknown secondary type 0x%02x\n",
@ -1041,6 +1050,8 @@ grub_fat_label (grub_device_t device, char **label)
if (dir.entry_type == 0x83) if (dir.entry_type == 0x83)
{ {
grub_size_t chc; grub_size_t chc;
grub_uint16_t t[ARRAY_SIZE (dir.type_specific.volume_label.str)];
grub_size_t i;
*label = grub_malloc (ARRAY_SIZE (dir.type_specific.volume_label.str) *label = grub_malloc (ARRAY_SIZE (dir.type_specific.volume_label.str)
* GRUB_MAX_UTF8_PER_UTF16 + 1); * GRUB_MAX_UTF8_PER_UTF16 + 1);
if (!*label) if (!*label)
@ -1051,8 +1062,9 @@ grub_fat_label (grub_device_t device, char **label)
chc = dir.type_specific.volume_label.character_count; chc = dir.type_specific.volume_label.character_count;
if (chc > ARRAY_SIZE (dir.type_specific.volume_label.str)) if (chc > ARRAY_SIZE (dir.type_specific.volume_label.str))
chc = ARRAY_SIZE (dir.type_specific.volume_label.str); chc = ARRAY_SIZE (dir.type_specific.volume_label.str);
*grub_utf16_to_utf8 ((grub_uint8_t *) *label, for (i = 0; i < chc; i++)
dir.type_specific.volume_label.str, chc) = '\0'; t[i] = grub_le_to_cpu16 (dir.type_specific.volume_label.str[i]);
*grub_utf16_to_utf8 ((grub_uint8_t *) *label, t, chc) = '\0';
} }
} }