Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
315 lines
7.6 KiB
C
315 lines
7.6 KiB
C
/* pc.c - Read PC style partition tables. */
|
||
/*
|
||
* GRUB -- GRand Unified Bootloader
|
||
* Copyright (C) 2002,2004,2005,2006 Free Software Foundation, Inc.
|
||
*
|
||
* GRUB is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2 of the License, or
|
||
* (at your option) any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with GRUB; if not, write to the Free Software
|
||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||
*/
|
||
|
||
#include <grub/partition.h>
|
||
#include <grub/pc_partition.h>
|
||
#include <grub/disk.h>
|
||
#include <grub/mm.h>
|
||
#include <grub/misc.h>
|
||
#include <grub/dl.h>
|
||
|
||
static struct grub_partition_map grub_pc_partition_map;
|
||
|
||
#ifndef GRUB_UTIL
|
||
static grub_dl_t my_mod;
|
||
#endif
|
||
|
||
|
||
/* Parse the partition representation in STR and return a partition. */
|
||
static grub_partition_t
|
||
grub_partition_parse (const char *str)
|
||
{
|
||
grub_partition_t p;
|
||
struct grub_pc_partition *pcdata;
|
||
|
||
char *s = (char *) str;
|
||
|
||
p = (grub_partition_t) grub_malloc (sizeof (*p));
|
||
if (! p)
|
||
return 0;
|
||
|
||
pcdata = (struct grub_pc_partition *) grub_malloc (sizeof (*pcdata));
|
||
if (! pcdata)
|
||
goto fail;
|
||
|
||
p->data = pcdata;
|
||
p->partmap = &grub_pc_partition_map;
|
||
|
||
/* Initialize some of the fields with invalid values. */
|
||
pcdata->bsd_part = pcdata->dos_type = pcdata->bsd_type = p->index = -1;
|
||
|
||
/* Get the DOS partition number. */
|
||
pcdata->dos_part = grub_strtoul (s, &s, 0);
|
||
|
||
if (grub_errno)
|
||
{
|
||
/* Not found. Maybe only a BSD label is specified. */
|
||
pcdata->dos_part = -1;
|
||
grub_errno = GRUB_ERR_NONE;
|
||
}
|
||
else if (*s == ',')
|
||
s++;
|
||
|
||
if (*s)
|
||
{
|
||
if (*s >= 'a' && *s <= 'h')
|
||
{
|
||
pcdata->bsd_part = *s - 'a';
|
||
s++;
|
||
}
|
||
|
||
if (*s)
|
||
goto fail;
|
||
}
|
||
|
||
if (pcdata->dos_part == -1 && pcdata->bsd_part == -1)
|
||
goto fail;
|
||
|
||
return p;
|
||
|
||
fail:
|
||
grub_free (p);
|
||
grub_free (pcdata);
|
||
grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
|
||
return 0;
|
||
}
|
||
|
||
static grub_err_t
|
||
pc_partition_map_iterate (grub_disk_t disk,
|
||
int (*hook) (grub_disk_t disk,
|
||
const grub_partition_t partition))
|
||
{
|
||
struct grub_partition p;
|
||
struct grub_pc_partition pcdata;
|
||
struct grub_pc_partition_mbr mbr;
|
||
struct grub_pc_partition_disk_label label;
|
||
struct grub_disk raw;
|
||
|
||
/* Enforce raw disk access. */
|
||
raw = *disk;
|
||
raw.partition = 0;
|
||
|
||
p.offset = 0;
|
||
pcdata.ext_offset = 0;
|
||
pcdata.dos_part = -1;
|
||
p.data = &pcdata;
|
||
p.partmap = &grub_pc_partition_map;
|
||
|
||
while (1)
|
||
{
|
||
int i;
|
||
struct grub_pc_partition_entry *e;
|
||
|
||
/* Read the MBR. */
|
||
if (grub_disk_read (&raw, p.offset, 0, sizeof (mbr), (char *) &mbr))
|
||
goto finish;
|
||
|
||
/* Check if it is valid. */
|
||
if (mbr.signature != grub_cpu_to_le16 (GRUB_PC_PARTITION_SIGNATURE))
|
||
return grub_error (GRUB_ERR_BAD_PART_TABLE, "no signature");
|
||
|
||
/* Analyze DOS partitions. */
|
||
for (p.index = 0; p.index < 4; p.index++)
|
||
{
|
||
e = mbr.entries + p.index;
|
||
|
||
p.start = p.offset + grub_le_to_cpu32 (e->start);
|
||
p.len = grub_le_to_cpu32 (e->length);
|
||
pcdata.bsd_part = -1;
|
||
pcdata.dos_type = e->type;
|
||
pcdata.bsd_type = -1;
|
||
|
||
grub_dprintf ("partition",
|
||
"partition %d: flag 0x%x, type 0x%x, start 0x%llx, len 0x%llx\n",
|
||
p.index, e->flag, pcdata.dos_type, p.start, p.len);
|
||
|
||
/* If this is a GPT partition, this MBR is just a dummy. */
|
||
if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK && p.index == 0)
|
||
return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr");
|
||
|
||
/* If this partition is a normal one, call the hook. */
|
||
if (! grub_pc_partition_is_empty (e->type)
|
||
&& ! grub_pc_partition_is_extended (e->type))
|
||
{
|
||
pcdata.dos_part++;
|
||
|
||
if (hook (disk, &p))
|
||
goto finish;
|
||
|
||
/* Check if this is a BSD partition. */
|
||
if (grub_pc_partition_is_bsd (e->type))
|
||
{
|
||
/* Check if the BSD label is within the DOS partition. */
|
||
if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR)
|
||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||
"no space for disk label");
|
||
|
||
/* Read the BSD label. */
|
||
if (grub_disk_read (&raw,
|
||
(p.start
|
||
+ GRUB_PC_PARTITION_BSD_LABEL_SECTOR),
|
||
0,
|
||
sizeof (label),
|
||
(char *) &label))
|
||
goto finish;
|
||
|
||
/* Check if it is valid. */
|
||
if (label.magic
|
||
!= grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC))
|
||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||
"invalid disk label magic 0x%x",
|
||
label.magic);
|
||
|
||
for (pcdata.bsd_part = 0;
|
||
pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions);
|
||
pcdata.bsd_part++)
|
||
{
|
||
struct grub_pc_partition_bsd_entry *be
|
||
= label.entries + pcdata.bsd_part;
|
||
|
||
p.start = grub_le_to_cpu32 (be->offset);
|
||
p.len = grub_le_to_cpu32 (be->size);
|
||
pcdata.bsd_type = be->fs_type;
|
||
|
||
if (be->fs_type != GRUB_PC_PARTITION_BSD_TYPE_UNUSED)
|
||
if (hook (disk, &p))
|
||
goto finish;
|
||
}
|
||
}
|
||
}
|
||
else if (pcdata.dos_part < 4)
|
||
/* If this partition is a logical one, shouldn't increase the
|
||
partition number. */
|
||
pcdata.dos_part++;
|
||
}
|
||
|
||
/* Find an extended partition. */
|
||
for (i = 0; i < 4; i++)
|
||
{
|
||
e = mbr.entries + i;
|
||
|
||
if (grub_pc_partition_is_extended (e->type))
|
||
{
|
||
p.offset = pcdata.ext_offset + grub_le_to_cpu32 (e->start);
|
||
if (! pcdata.ext_offset)
|
||
pcdata.ext_offset = p.offset;
|
||
|
||
break;
|
||
}
|
||
}
|
||
|
||
/* If no extended partition, the end. */
|
||
if (i == 4)
|
||
break;
|
||
}
|
||
|
||
finish:
|
||
return grub_errno;
|
||
}
|
||
|
||
|
||
static grub_partition_t
|
||
pc_partition_map_probe (grub_disk_t disk, const char *str)
|
||
{
|
||
grub_partition_t p;
|
||
struct grub_pc_partition *pcdata;
|
||
|
||
auto int find_func (grub_disk_t d, const grub_partition_t partition);
|
||
|
||
int find_func (grub_disk_t d __attribute__ ((unused)),
|
||
const grub_partition_t partition)
|
||
{
|
||
struct grub_pc_partition *partdata = partition->data;
|
||
if ((pcdata->dos_part == partdata->dos_part || pcdata->dos_part == -1)
|
||
&& pcdata->bsd_part == partdata->bsd_part)
|
||
{
|
||
grub_memcpy (p, partition, sizeof (*p));
|
||
p->data = pcdata;
|
||
grub_memcpy (pcdata, partdata, sizeof (*pcdata));
|
||
return 1;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
p = grub_partition_parse (str);
|
||
if (! p)
|
||
return 0;
|
||
|
||
pcdata = p->data;
|
||
if (pc_partition_map_iterate (disk, find_func))
|
||
goto fail;
|
||
|
||
if (p->index < 0)
|
||
{
|
||
grub_error (GRUB_ERR_BAD_DEVICE, "no such partition");
|
||
goto fail;
|
||
}
|
||
|
||
return p;
|
||
|
||
fail:
|
||
grub_free (p);
|
||
grub_free (pcdata);
|
||
return 0;
|
||
}
|
||
|
||
|
||
static char *
|
||
pc_partition_map_get_name (const grub_partition_t p)
|
||
{
|
||
char *name;
|
||
struct grub_pc_partition *pcdata = p->data;
|
||
|
||
name = grub_malloc (13);
|
||
if (! name)
|
||
return 0;
|
||
|
||
if (pcdata->bsd_part < 0)
|
||
grub_sprintf (name, "%d", pcdata->dos_part);
|
||
else
|
||
grub_sprintf (name, "%d,%c", pcdata->dos_part, pcdata->bsd_part + 'a');
|
||
|
||
return name;
|
||
}
|
||
|
||
|
||
/* Partition map type. */
|
||
static struct grub_partition_map grub_pc_partition_map =
|
||
{
|
||
.name = "pc_partition_map",
|
||
.iterate = pc_partition_map_iterate,
|
||
.probe = pc_partition_map_probe,
|
||
.get_name = pc_partition_map_get_name
|
||
};
|
||
|
||
GRUB_MOD_INIT(pc_partition_map)
|
||
{
|
||
grub_partition_map_register (&grub_pc_partition_map);
|
||
#ifndef GRUB_UTIL
|
||
my_mod = mod;
|
||
#endif
|
||
}
|
||
|
||
GRUB_MOD_FINI(pc_partition_map)
|
||
{
|
||
grub_partition_map_unregister (&grub_pc_partition_map);
|
||
}
|