mirror of
https://git.proxmox.com/git/grub2
synced 2026-02-02 07:24:05 +00:00
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.
261 lines
6.4 KiB
C
261 lines
6.4 KiB
C
/* loopback.c - command to add loopback devices. */
|
||
/*
|
||
* GRUB -- GRand Unified Bootloader
|
||
* Copyright (C) 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/normal.h>
|
||
#include <grub/dl.h>
|
||
#include <grub/arg.h>
|
||
#include <grub/misc.h>
|
||
#include <grub/file.h>
|
||
#include <grub/disk.h>
|
||
#include <grub/mm.h>
|
||
|
||
struct grub_loopback
|
||
{
|
||
char *devname;
|
||
char *filename;
|
||
int has_partitions;
|
||
struct grub_loopback *next;
|
||
};
|
||
|
||
static struct grub_loopback *loopback_list;
|
||
|
||
static const struct grub_arg_option options[] =
|
||
{
|
||
{"delete", 'd', 0, "delete the loopback device entry", 0, 0},
|
||
{"partitions", 'p', 0, "set that the drive has partitions to"
|
||
" simulate a harddrive", 0, 0},
|
||
{0, 0, 0, 0, 0, 0}
|
||
};
|
||
|
||
/* Delete the loopback device NAME. */
|
||
static grub_err_t
|
||
delete_loopback (const char *name)
|
||
{
|
||
struct grub_loopback *dev;
|
||
struct grub_loopback **prev;
|
||
|
||
/* Search for the device. */
|
||
for (dev = loopback_list, prev = &loopback_list;
|
||
dev;
|
||
prev = &dev->next, dev = dev->next)
|
||
if (grub_strcmp (dev->devname, name) == 0)
|
||
break;
|
||
|
||
if (! dev)
|
||
return grub_error (GRUB_ERR_BAD_DEVICE, "Device not found");
|
||
|
||
/* Remove the device from the list. */
|
||
*prev = dev->next;
|
||
|
||
grub_free (dev->devname);
|
||
grub_free (dev->filename);
|
||
grub_free (dev);
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* The command to add and remove loopback devices. */
|
||
static grub_err_t
|
||
grub_cmd_loopback (struct grub_arg_list *state,
|
||
int argc, char **args)
|
||
{
|
||
grub_file_t file;
|
||
struct grub_loopback *newdev;
|
||
|
||
if (argc < 1)
|
||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
|
||
|
||
/* Check if `-d' was used. */
|
||
if (state[0].set)
|
||
return delete_loopback (args[0]);
|
||
|
||
if (argc < 2)
|
||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
|
||
|
||
file = grub_file_open (args[1]);
|
||
if (! file)
|
||
return grub_errno;
|
||
|
||
/* Close the file, the only reason for opening it is validation. */
|
||
grub_file_close (file);
|
||
|
||
/* First try to replace the old device. */
|
||
for (newdev = loopback_list; newdev; newdev = newdev->next)
|
||
if (grub_strcmp (newdev->devname, args[0]) == 0)
|
||
break;
|
||
|
||
if (newdev)
|
||
{
|
||
char *newname = grub_strdup (args[1]);
|
||
if (! newname)
|
||
return grub_errno;
|
||
|
||
grub_free (newdev->filename);
|
||
newdev->filename = newname;
|
||
|
||
/* Set has_partitions when `--partitions' was used. */
|
||
newdev->has_partitions = state[1].set;
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Unable to replace it, make a new entry. */
|
||
newdev = grub_malloc (sizeof (struct grub_loopback));
|
||
if (! newdev)
|
||
return grub_errno;
|
||
|
||
newdev->devname = grub_strdup (args[0]);
|
||
if (! newdev->devname)
|
||
{
|
||
grub_free (newdev);
|
||
return grub_errno;
|
||
}
|
||
|
||
newdev->filename = grub_strdup (args[1]);
|
||
if (! newdev->filename)
|
||
{
|
||
grub_free (newdev->devname);
|
||
grub_free (newdev);
|
||
return grub_errno;
|
||
}
|
||
|
||
/* Set has_partitions when `--partitions' was used. */
|
||
newdev->has_partitions = state[1].set;
|
||
|
||
/* Add the new entry to the list. */
|
||
newdev->next = loopback_list;
|
||
loopback_list = newdev;
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
static int
|
||
grub_loopback_iterate (int (*hook) (const char *name))
|
||
{
|
||
struct grub_loopback *d;
|
||
for (d = loopback_list; d; d = d->next)
|
||
{
|
||
if (hook (d->devname))
|
||
return 1;
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
static grub_err_t
|
||
grub_loopback_open (const char *name, grub_disk_t disk)
|
||
{
|
||
grub_file_t file;
|
||
struct grub_loopback *dev;
|
||
|
||
for (dev = loopback_list; dev; dev = dev->next)
|
||
if (grub_strcmp (dev->devname, name) == 0)
|
||
break;
|
||
|
||
if (! dev)
|
||
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Can't open device");
|
||
|
||
file = grub_file_open (dev->filename);
|
||
if (! file)
|
||
return grub_errno;
|
||
|
||
/* Use the filesize for the disk size, round up to a complete sector. */
|
||
disk->total_sectors = ((file->size + GRUB_DISK_SECTOR_SIZE - 1)
|
||
/ GRUB_DISK_SECTOR_SIZE);
|
||
disk->id = (int) dev;
|
||
|
||
disk->has_partitions = dev->has_partitions;
|
||
disk->data = file;
|
||
|
||
return 0;
|
||
}
|
||
|
||
static void
|
||
grub_loopback_close (grub_disk_t disk)
|
||
{
|
||
grub_file_t file = (grub_file_t) disk->data;
|
||
|
||
grub_file_close (file);
|
||
}
|
||
|
||
static grub_err_t
|
||
grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector,
|
||
grub_size_t size, char *buf)
|
||
{
|
||
grub_file_t file = (grub_file_t) disk->data;
|
||
grub_off_t pos;
|
||
|
||
grub_file_seek (file, sector << GRUB_DISK_SECTOR_BITS);
|
||
|
||
grub_file_read (file, buf, size << GRUB_DISK_SECTOR_BITS);
|
||
if (grub_errno)
|
||
return grub_errno;
|
||
|
||
/* In case there is more data read than there is available, in case
|
||
of files that are not a multiple of GRUB_DISK_SECTOR_SIZE, fill
|
||
the rest with zeros. */
|
||
pos = (sector + size) << GRUB_DISK_SECTOR_BITS;
|
||
if (pos > file->size)
|
||
{
|
||
grub_size_t amount = pos - file->size;
|
||
grub_memset (buf + size - amount, 0, amount);
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
static grub_err_t
|
||
grub_loopback_write (grub_disk_t disk __attribute ((unused)),
|
||
grub_disk_addr_t sector __attribute ((unused)),
|
||
grub_size_t size __attribute ((unused)),
|
||
const char *buf __attribute ((unused)))
|
||
{
|
||
return GRUB_ERR_NOT_IMPLEMENTED_YET;
|
||
}
|
||
|
||
static struct grub_disk_dev grub_loopback_dev =
|
||
{
|
||
.name = "loopback",
|
||
.id = GRUB_DISK_DEVICE_LOOPBACK_ID,
|
||
.iterate = grub_loopback_iterate,
|
||
.open = grub_loopback_open,
|
||
.close = grub_loopback_close,
|
||
.read = grub_loopback_read,
|
||
.write = grub_loopback_write,
|
||
.next = 0
|
||
};
|
||
|
||
|
||
|
||
GRUB_MOD_INIT(loop)
|
||
{
|
||
(void) mod; /* To stop warning. */
|
||
grub_register_command ("loopback", grub_cmd_loopback, GRUB_COMMAND_FLAG_BOTH,
|
||
"loopback [-d|-p] DEVICENAME FILE",
|
||
"Make a device of a file.", options);
|
||
grub_disk_dev_register (&grub_loopback_dev);
|
||
}
|
||
|
||
GRUB_MOD_FINI(loop)
|
||
{
|
||
grub_unregister_command ("loopback");
|
||
grub_disk_dev_unregister (&grub_loopback_dev);
|
||
}
|