"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ChangeLog" between
grub-2.02.tar.xz and grub-2.04.tar.xz

About: GNU GRUB 2 - a multiboot boot loader.

ChangeLog  (grub-2.02.tar.xz):ChangeLog  (grub-2.04.tar.xz)
2019-07-04 Daniel Kiper <daniel.kiper@oracle.com>
Release 2.04
2019-06-24 Thomas Schmitt <scdbackup@gmx.net>
docs: Document workaround for grub-mkrescue with older MacBooks
Add a description of the workaround for firmware of older MacBooks
which stalls with a grub-mkrescue ISO image for x86_64-efi target
on an USB stick.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-06-24 Eric Snowberg <eric.snowberg@oracle.com>
docs: Bootstrap changes required for older distros
Some older distros do not contain gettext 0.18. Document the workaround
to use the bootstrap utility on these systems.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-06-07 Leif Lindholm <leif.lindholm@linaro.org>
ia64: build fix in cache.h
Add IA64 to the architectures excluding a declaration for
grub_arch_sync_dma_caches().
IA64 does not include any of the source files that require the function,
but was overlooked for d8901e3ba115 ("cache: Fix compilation for ppc,
sparc and arm64").
Add it to the list of excluding architectures in order to not get
missing symbol errors when running grub-mkimage.
Reported-by: Alexander Graf <agraf@csgraf.de>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-06-07 Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
hostfs: #undef open and close.
Unlike in case of disks in this case it's just a single place, so it's ea
sier
to just #undef
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-06-03 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
f2fs: Disable gcc9 -Waddress-of-packed-member
Disable the -Wadress-of-packaed-member diagnostic for the grub_f2fs_label
function since the result is found to be false postive.
A pointer to the 'volume_name' member of 'struct grub_f2fs_superblock' is
guaranteed to be aligned as the offset of 'volume_name' within the struct
is dividable by the natural alignment on both 32- and 64-bit targets.
grub-core/fs/f2fs.c: In function ‘grub_f2fs_label’:
grub-core/fs/f2fs.c:1253:60: error: taking address of packed member of ‘s
truct grub_f2fs_superblock’ may result in an unaligned pointer value [-Werror=ad
dress-of-packed-member]
1253 | *label = (char *) grub_f2fs_utf16_to_utf8 (data->sblock.volum
e_name);
| ~~~~~~~~~~~~^~~~~~
~~~~~~
cc1: all warnings being treated as errors
Reported-by: Neil MacLeod <neil@nmacleod.com>
Tested-by: Neil MacLeod <neil@nmacleod.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-05-20 Vincent Legoll <vincent.legoll@gmail.com>
grub-mkrescue: Fix error message about the wrong command having failed: m
format instead of mcopy
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-05-20 Mathieu Trudel-Lapierre <mathieu.tl@gmail.com>
video: skip 'text' gfxpayload if not supported, to fallback to default
On UEFI, 'text' gfxpayload is not supported, but we still reach parse_mod
espec()
with it, which will obviously fail. Fortunately, whatever gfxpayload is s
et,
we still still have the 'auto' default to fall back to. Allow getting to
this
fallback by not trying to parse 'text' as a modespec.
This is because 'text' correctly doesn't parse as a modespec, and ought t
o have
been ignored before we got to that point, just like it is immediately pic
ked if
we're running on a system where 'text' is a supported video mode.
Bug: https://savannah.gnu.org/bugs/index.php?56217
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-05-20 Ovidiu Panait <ovidiu.panait@windriver.com>
grub-mkconfig: Use -c instead of --printf for stat
"--printf" only works with the stat variant provided by coreutils.
With busybox, stat will fail with the following error:
stat: unrecognized option '--printf=%T'
Usage: stat [OPTIONS] FILE...
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-05-20 Michael Chang <mchang@suse.com>
f2fs: Fix gcc9 error -Werror=maybe-uninitialized
The function grub_get_node_path() could return uninitialized offset with
level == 0 if the block is greater than direct_index + 2 * direct_blks +
2 * indirect_blks + dindirect_blks. The uninitialized offset is then used
by function grub_f2fs_get_block() because level == 0 is valid and
meaningful return to be processed.
The fix is to set level = -1 as return value by grub_get_node_path() to
signify an error that the input block cannot be handled. Any caller
should therefore check level is negative or not before processing the
output.
Reported-by: Neil MacLeod <neil@nmacleod.com>
Tested-by: Neil MacLeod <neil@nmacleod.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-05-06 Alexander Graf <agraf@csgraf.de>
arm: Align section alignment with manual relocation offset code
The arm relocation code has a manual special case for EFI binaries to
add the natural alignment to its own relocation awareness.
Since commit a51f953f4ee87 ("mkimage: Align efi sections on 4k
boundary") we changed that alignment from 0x400 to 0x1000 bytes. Reflect
the change in that branch that we forgot as well.
This fixes running 32bit arm grub efi binaries for me again.
Fixes: a51f953f4ee87 ("mkimage: Align efi sections on 4k boundary")
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reported-by: Steve McIntyre <steve@einval.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Julien ROBIN <julien.robin28@free.fr>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-05-06 Alexander Graf <agraf@csgraf.de>
arm: Move trampolines into code section
When creating T32->A32 transition jumps, the relocation code in grub
will generate trampolines. These trampolines live in the .data section
of our PE binary which means they are not marked as executable.
This misbehavior was unmasked by commit a51f953f4ee87 ("mkimage: Align
efi sections on 4k boundary") which made the X/NX boundary more obvious
because everything became page aligned.
To put things into proper order, let's move the arm trampolines into the
.text section instead. That way everyone knows they are executable.
Fixes: a51f953f4ee87 ("mkimage: Align efi sections on 4k boundary")
Reported-by: Julien ROBIN <julien.robin28@free.fr>
Reported-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Julien ROBIN <julien.robin28@free.fr>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
efi: Fix gcc9 error -Waddress-of-packed-member
The address of fp->path_name could be unaligned since seeking into the
device path buffer for a given node could end in byte boundary.
The fix is allocating aligned buffer by grub_malloc for holding the
UTF16 string copied from fp->path_name, and after using that buffer as
argument for grub_utf16_to_utf8 to convert it to UTF8 string.
[ 255s] ../../grub-core/kern/efi/efi.c: In function 'grub_efi_get_filena
me':
[ 255s] ../../grub-core/kern/efi/efi.c:410:60: error: taking address of
packed member of 'struct grub_efi_file_path_device_path' may result in an unalig
ned pointer value [-Werror=address-of-packed-member]
[ 255s] 410 | p = (char *) grub_utf16_to_utf8 ((unsigned char *) p,
fp->path_name, len);
[ 255s] |
~~^~~~~~~~~~~
[ 255s] ../../grub-core/kern/efi/efi.c: In function 'grub_efi_print_devi
ce_path':
[ 255s] ../../grub-core/kern/efi/efi.c:900:33: error: taking address of
packed member of 'struct grub_efi_file_path_device_path' may result in an unalig
ned pointer value [-Werror=address-of-packed-member]
[ 255s] 900 | *grub_utf16_to_utf8 (buf, fp->path_name,
[ 255s] | ~~^~~~~~~~~~~
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
chainloader: Fix gcc9 error -Waddress-of-packed-member
The address of fp->path_name could be unaligned since seeking into the
device path buffer for a given node could end in byte boundary.
The fix is using aligned buffer allocated by grub_malloc for receiving
the converted UTF16 string by grub_utf8_to_utf16 and also the processing
after. The resulting string then gets copied to fp->path_name.
[ 243s] ../../grub-core/loader/efi/chainloader.c: In function 'copy_file
_path':
[ 243s] ../../grub-core/loader/efi/chainloader.c:136:32: error: taking a
ddress of packed member of 'struct grub_efi_file_path_device_path' may result in
an unaligned pointer value [-Werror=address-of-packed-member]
[ 243s] 136 | size = grub_utf8_to_utf16 (fp->path_name, len * GRUB_M
AX_UTF16_PER_UTF8,
[ 243s] | ~~^~~~~~~~~~~
[ 243s] ../../grub-core/loader/efi/chainloader.c:138:12: error: taking a
ddress of packed member of 'struct grub_efi_file_path_device_path' may result in
an unaligned pointer value [-Werror=address-of-packed-member]
[ 243s] 138 | for (p = fp->path_name; p < fp->path_name + size; p++)
[ 243s] | ^~
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
usbtest: Disable gcc9 -Waddress-of-packed-member
Disable the -Wadress-of-packaed-member diagnostic for the
grub_usb_get_string function since the result is false postive. The
descstrp->str is found to be aligned in the buffer allocated for 'struct
grub_usb_desc_str'.
[ 229s] ../../grub-core/commands/usbtest.c: In function 'grub_usb_get_st
ring':
[ 229s] ../../grub-core/commands/usbtest.c:104:58: error: taking address
of packed member of 'struct grub_usb_desc_str' may result in an unaligned point
er value [-Werror=address-of-packed-member]
[ 229s] 104 | *grub_utf16_to_utf8 ((grub_uint8_t *) *string, descstr
p->str,
[ 229s] | ~~~~~~~
~^~~~~
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
acpi: Fix gcc9 error -Waddress-of-packed-member
Simply adds the missing packed attribute to 'struct grub_acpi_madt'.
[ 233s] ../../grub-core/commands/lsacpi.c: In function 'disp_acpi_xsdt_t
able':
[ 233s] ../../grub-core/commands/lsacpi.c:201:27: error: converting a pa
cked 'struct grub_acpi_table_header' pointer (alignment 1) to a 'struct grub_acp
i_madt' pointer (alignment 4) may result in an unaligned pointer value [-Werror=
address-of-packed-member]
[ 233s] 201 | disp_madt_table ((struct grub_acpi_madt *) t);
[ 233s] | ^~~~~~~~~~~~~~
[ 233s] In file included from ../../grub-core/commands/lsacpi.c:23:
[ 233s] ../../include/grub/acpi.h:50:8: note: defined here
[ 233s] 50 | struct grub_acpi_table_header
[ 233s] | ^~~~~~~~~~~~~~~~~~~~~~
[ 233s] ../../include/grub/acpi.h:90:8: note: defined here
[ 233s] 90 | struct grub_acpi_madt
[ 233s] | ^~~~~~~~~~~~~~
[ 233s] ../../grub-core/commands/lsacpi.c: In function 'disp_acpi_rsdt_t
able':
[ 233s] ../../grub-core/commands/lsacpi.c:225:27: error: converting a pa
cked 'struct grub_acpi_table_header' pointer (alignment 1) to a 'struct grub_acp
i_madt' pointer (alignment 4) may result in an unaligned pointer value [-Werror=
address-of-packed-member]
[ 233s] 225 | disp_madt_table ((struct grub_acpi_madt *) t);
[ 233s] | ^~~~~~~~~~~~~~
[ 233s] In file included from ../../grub-core/commands/lsacpi.c:23:
[ 233s] ../../include/grub/acpi.h:50:8: note: defined here
[ 233s] 50 | struct grub_acpi_table_header
[ 233s] | ^~~~~~~~~~~~~~~~~~~~~~
[ 233s] ../../include/grub/acpi.h:90:8: note: defined here
[ 233s] 90 | struct grub_acpi_madt
[ 233s] | ^~~~~~~~~~~~~~
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
hfsplus: Fix gcc9 error with -Waddress-of-packed-member
The catkey->name could be unaligned since the address of 'void* record'
is calculated as offset in bytes to a malloc buffer.
The fix is using aligned buffer allocated by grub_malloc for holding
the UTF16 string copied from catkey->name. And use that buffer as
argument for grub_utf16_to_utf8 to convert to UTF8 strings.
In addition, using a new copy of buffer rather than catkey->name itself
for processing the endianess conversion, we can also get rid of the hunk
restoring byte order of catkey->name to what it was previously.
[ 59s] ../grub-core/fs/hfsplus.c: In function 'list_nodes':
[ 59s] ../grub-core/fs/hfsplus.c:738:57: error: taking address of packe
d member of 'struct grub_hfsplus_catkey' may result in an unaligned pointer valu
e [-Werror=address-of-packed-member]
[ 59s] 738 | *grub_utf16_to_utf8 ((grub_uint8_t *) filename, catkey
->name,
[ 59s] | ~~~~~~
^~~~~~
[ 59s] ../grub-core/fs/hfsplus.c: In function 'grub_hfsplus_label':
[ 59s] ../grub-core/fs/hfsplus.c:1019:57: error: taking address of pack
ed member of 'struct grub_hfsplus_catkey' may result in an unaligned pointer val
ue [-Werror=address-of-packed-member]
[ 59s] 1019 | *grub_utf16_to_utf8 ((grub_uint8_t *) (*label), catkey
->name,
[ 59s] | ~~~~~~
^~~~~~
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
hfs: Fix gcc9 error -Waddress-of-packed-member
Simply adds the missing packed attribute to 'struct grub_hfs_extent'.
[ 83s] ../grub-core/fs/hfs.c: In function 'grub_hfs_iterate_records':
[ 83s] ../grub-core/fs/hfs.c:699:9: error: taking address of packed mem
ber of 'struct grub_hfs_sblock' may result in an unaligned pointer value [-Werro
r=address-of-packed-member]
[ 83s] 699 | ? (&data->sblock.catalog_recs)
[ 83s] | ~^~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 83s] ../grub-core/fs/hfs.c:700:9: error: taking address of packed mem
ber of 'struct grub_hfs_sblock' may result in an unaligned pointer value [-Werro
r=address-of-packed-member]
[ 83s] 700 | : (&data->sblock.extent_recs));
[ 83s] | ~^~~~~~~~~~~~~~~~~~~~~~~~~~
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
jfs: Disable gcc9 -Waddress-of-packed-member
Disable the -Wadress-of-packaed-member diagnostic for the
grub_jfs_getent function since the result is found to be false postive.
The leaf is read into memory as continous chunks in size of 32 bytes and
the pointer to its base is aligned, which also guarentee its member
leaf->namepart is aligned.
[ 60s] ../grub-core/fs/jfs.c: In function 'grub_jfs_getent':
[ 60s] ../grub-core/fs/jfs.c:557:44: error: taking address of packed me
mber of 'struct grub_jfs_leaf_dirent' may result in an unaligned pointer value [
-Werror=address-of-packed-member]
[ 60s] 557 | le_to_cpu16_copy (filename + strpos, leaf->namepart, l
en < diro->data->namecomponentlen ? len
[ 60s] | ~~~~^~~~~~~~~~
[ 60s] ../grub-core/fs/jfs.c:570:48: error: taking address of packed me
mber of 'struct grub_jfs_leaf_next_dirent' may result in an unaligned pointer va
lue [-Werror=address-of-packed-member]
[ 60s] 570 | le_to_cpu16_copy (filename + strpos, next_leaf->namepar
t, len < 15 ? len : 15);
[ 60s] | ~~~~~~~~~^~~~~~~~~
~
[ 60s] cc1: all warnings being treated as errors
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Michael Chang <mchang@suse.com>
cpio: Disable gcc9 -Waddress-of-packed-member
Disable the -Wadress-of-packaed-member diagnostic for the
grub_cpio_find_file function since the result is found to be false
postive. Any pointers to member of the 'struct head hd' is aligned even
if the structure is packed without paddings.
[ 59s] In file included from ../grub-core/fs/cpio.c:51:
[ 59s] ../grub-core/fs/cpio_common.c: In function 'grub_cpio_find_file'
:
[ 59s] ../grub-core/fs/cpio_common.c:58:31: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 58 | data->size = read_number (hd.filesize, ARRAY_SIZE (hd.
filesize));
[ 59s] | ~~^~~~~~~~~
[ 59s] ../grub-core/fs/cpio_common.c:60:29: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 60 | *mtime = read_number (hd.mtime, ARRAY_SIZE (hd.mtime
));
[ 59s] | ~~^~~~~~
[ 59s] ../grub-core/fs/cpio_common.c:61:28: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 61 | modeval = read_number (hd.mode, ARRAY_SIZE (hd.mode));
[ 59s] | ~~^~~~~
[ 59s] ../grub-core/fs/cpio_common.c:62:29: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 62 | namesize = read_number (hd.namesize, ARRAY_SIZE (hd.na
mesize));
[ 59s] | ~~^~~~~~~~~
[ 59s] In file included from ../grub-core/fs/cpio_be.c:51:
[ 59s] ../grub-core/fs/cpio_common.c: In function 'grub_cpio_find_file'
:
[ 59s] ../grub-core/fs/cpio_common.c:58:31: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 58 | data->size = read_number (hd.filesize, ARRAY_SIZE (hd.
filesize));
[ 59s] | ~~^~~~~~~~~
[ 59s] ../grub-core/fs/cpio_common.c:60:29: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 60 | *mtime = read_number (hd.mtime, ARRAY_SIZE (hd.mtime
));
[ 59s] | ~~^~~~~~
[ 59s] ../grub-core/fs/cpio_common.c:61:28: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 61 | modeval = read_number (hd.mode, ARRAY_SIZE (hd.mode));
[ 59s] | ~~^~~~~
[ 59s] ../grub-core/fs/cpio_common.c:62:29: error: taking address of pa
cked member of 'struct head' may result in an unaligned pointer value [-Werror=a
ddress-of-packed-member]
[ 59s] 62 | namesize = read_number (hd.namesize, ARRAY_SIZE (hd.na
mesize));
[ 59s] | ~~^~~~~~~~~
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Heinrich Schuchardt <xypron.glpk@gmx.de>
efi: Avoid NULL dereference if FilePath is NULL
The UEFI specification allows LoadImage() to be called with a memory
location only and without a device path. In this case FilePath will not b
e
set in the EFI_LOADED_IMAGE_PROTOCOL.
So in function grub_efi_get_filename() the device path argument may be
NULL. As we cannot determine the device path in this case just return NUL
L
from the function.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-23 Daniel Kiper <daniel.kiper@oracle.com>
x86/msr: Fix build with older GCC versions
Some older GCC versions produce following error when x86 MSR modules are
build:
In file included from commands/i386/rdmsr.c:29:0:
../include/grub/i386/rdmsr.h:27:29: error: no previous prototype for ‘g
rub_msr_read’ [-Werror=missing-prototypes]
extern inline grub_uint64_t grub_msr_read (grub_uint32_t msr_id)
^
cc1: all warnings being treated as errors
This happens due to lack of support for a such usage of extern keyword
in older GCCs. Additionally, this usage is not consistent with the rest
of codebase. So, replace it with static keyword.
Additionally, fix incorrect coding style.
Reported-by: Eric Snowberg <eric.snowberg@oracle.com>
Reported-by: adrian15 <adrian15sgd@gmail.com>
Reviewed-by: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Reviewed-by: Eric Snowberg <eric.snowberg@oracle.com>
Tested-by: adrian15 <adrian15sgd@gmail.com>
2019-04-09 Vladimir Serbinenko <phcoder@gmail.com>
Release 2.04~rc1
2019-04-09 Vladimir Serbinenko <phcoder@gmail.com>
Change fs functions to add fs_ prefix
This avoid conflict with gnulib
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-08 Vladimir Serbinenko <phcoder@google.com>
A workaround for clang problem assembling startup_raw.S
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-04 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: NULL pointer dereference in grub_ieee1275_encode_devname()
Function grub_strndup() may return NULL, this is called from
function grub_ieee1275_get_devname() which is then called from
function grub_ieee1275_encode_devname() to set device. The device
variable could then be used with a NULL pointer.
Reviewed-by: Colin Watson <cjwatson@ubuntu.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-02 Daniel Kiper <daniel.kiper@oracle.com>
docs/grub-dev: Change comments rules
Current comments forms are annoying, so, some of them are disallowed
starting from now. New rules are more flexible and mostly aligned
with, e.g., Linux kernel comments rules.
Reviewed-by: Vladimir Serbinenko <phcoder@google.com>
2019-04-02 Andrew Jeddeloh <andrew.jeddeloh@coreos.com>
loader/i386/linux: Calculate the setup_header length
Previously the setup_header length was just assumed to be the size of the
linux_kernel_params struct. The linux x86 32-bit boot protocol says that
the
end of the linux_i386_kernel_header is at 0x202 + the byte value at 0x201
in
the linux_i386_kernel_header. So, calculate the size of the header using
the
end of the linux_i386_kernel_header, rather than assume it is the size of
the
linux_kernel_params struct.
Additionally, add some required members to the linux_kernel_params
struct and align the content of linux_i386_kernel_header struct with
it. New members naming was taken directly from Linux kernel source.
linux_kernel_params and linux_i386_kernel_header structs require more
cleanup. However, this is not urgent, so, let's do this after release.
Just in case...
Reviewed-by: Vladimir Serbinenko <phcoder@google.com>
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2019-04-02 Eric Snowberg <eric.snowberg@oracle.com>
efidisk: NULL pointer dereference in grub_efidisk_get_device_name()
Function grub_efi_find_last_device_path() may return NULL when called
from grub_efidisk_get_device_name().
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-02 Eric Snowberg <eric.snowberg@oracle.com>
efidisk: NULL pointer dereference in is_child()
Function grub_efi_find_last_device() path may return NULL when called
from is_child().
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-02 Eric Snowberg <eric.snowberg@oracle.com>
efidisk: Write to NULL pointer ldp
Function grub_efi_find_last_device_path() may return constant NULL when
called from find_parent_device().
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-04-02 Vladimir Serbinenko <phcoder@google.com>
clang: Pair -Qn with -Qunused-arguments.
When assembling module wirh clang -Qn ends up on command line but later i
gnored
To avoid it breaking the compile, add -Qunused-arguments.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-28 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
ieee1275: Fix path reference in comment of sparc64 boot loader code
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-28 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
ieee1275: Include a.out header in assembly of sparc64 boot loader
Recent versions of binutils dropped support for the a.out and COFF
formats on sparc64 targets. Since the boot loader on sparc64 is
supposed to be an a.out binary and the a.out header entries are
rather simple to calculate in our case, we just write the header
ourselves instead of relying on external tools to do that.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-26 Vladimir Serbinenko <phcoder@gmail.com>
Propagate GNU_PRINTF from gnulib vfprintf
gnulib now replaces vfprintf and hence its format becomes GNU_PRINTF form
at
This also fixes matching definitions to always use GNU format
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-26 Vladimir Serbinenko <phcoder@gmail.com>
efi/tpm.c: Add missing casts
Without those casts we get a warning about implicit conversion of pointer
to integer.
2019-03-26 Vladimir Serbinenko <phcoder@gmail.com>
POTFILES: Don't include gnulib in grub.pot
They're translated as a separate project, so we
don't want to submit them again.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-26 Vladimir Serbinenko <phcoder@google.com>
configure.ac: Use nostdlib when checking for nostdinc
With clang nostdinc behaviour is influenced by nostdlib. Since we
always add nostdlib, add it in test as well
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-25 Vladimir Serbinenko <phcoder@gmail.com>
efi/tpm.h: Fix hash_log_extend_event definition.
I didn't check the spec but pointer to address doesn't make much sense
and doesn't match the code.
Rename grub_disk members
Otherwise it horribly clashes with gnulib when it's
replacing open/write/read/close
grub-mkimagexx: Fix RISCV error message
Outputting a raw pointer doesn't match the format and is
also useless. Output offset instead.
kern/emu/misc.c: Don't include config-util.h when running as GRUB_BUILD
Support R_PPC_PLTREL24
It's emitted by clang 7. It's the same as R_PPC_REL24.
2019-03-20 Daniel Kiper <daniel.kiper@oracle.com>
sparc: Enable __clzsi2() and __clzdi2()
This patch is similiar to commit e795b9011 (RISC-V: Add libgcc helpers
for clz) but for SPARC target.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2019-03-20 Daniel Kiper <daniel.kiper@oracle.com>
mips: Enable __clzsi2()
This patch is similiar to commit e795b9011 (RISC-V: Add libgcc helpers
for clz) but for MIPS target.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2019-03-20 Daniel Kiper <daniel.kiper@oracle.com>
verifiers: MIPS fallout cleanup
MIPS fallout cleanup after commit 4d4a8c96e (verifiers: Add possibility
to verify kernel and modules command lines).
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2019-03-20 Daniel Kiper <daniel.kiper@oracle.com>
verifiers: PowerPC fallout cleanup
PowerPC fallout cleanup after commit 4d4a8c96e (verifiers: Add possibilit
y
to verify kernel and modules command lines) and ca0a4f689 (verifiers: Fil
e
type for fine-grained signature-verification controlling).
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2019-03-20 Daniel Kiper <daniel.kiper@oracle.com>
verifiers: IA-64 fallout cleanup
IA-64 fallout cleanup after commit 4d4a8c96e (verifiers: Add possibility
to verify kernel and modules command lines).
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2019-03-20 Colin Watson <cjwatson@ubuntu.com>
posix_wrap: Flesh out posix_wrap/limits.h a little more
In addition to what was already there, Gnulib's <intprops.h> needs SCHAR_
MIN,
SCHAR_MAX, SHRT_MIN, INT_MIN, LONG_MIN, and LONG_MAX. Fixes build on Cent
OS 7.
Reported-by: "Chen, Farrah" <farrah.chen@intel.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-19 Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
xen: Look for Xen notes in section headers too
Mirror behaviour of ELF loader in libxc: first look for Xen notes in
PT_NOTE segment, then in SHT_NOTE section and only then fallback to
a section with __xen_guest name. This fixes loading PV kernels that
Xen note have outside of PT_NOTE. While this may be result of a buggy
linker script, loading such kernel directly works fine, so make it work
with GRUB too. Specifically, this applies to binaries built from Unikraft
.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-19 Colin Watson <cjwatson@ubuntu.com>
getroot: Save/restore CWD more reliably on Unix
Various GRUB utilities fail if the current directory doesn't exist,
because grub_find_device() chdirs to a different directory and then
fails when trying to chdir back. Gnulib's save-cwd module uses fchdir()
instead when it can, avoiding this category of problem.
Fixes Debian bug #918700.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Add explicit net_dhcp command
Mostly for cosmetic reasons, we add a "net_dhcp" command, which is (at th
e
moment) identical to the existing "net_bootp" command. Both actually trig
ger
a DHCP handshake now, and both should be able to deal with pure BOOTP ser
vers.
We could think about dropping the DHCP options from the initial DISCOVER
packet
when the user issues the net_bootp command, but it's unclear whether this
is
really useful, as both protocols should be able to coexist.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Actually send out DHCPv4 DISCOVER and REQUEST messages
Even though we were parsing some DHCP options sent by the server, so far
we are only using the BOOTP 2-way handshake, even when talking to a DHCP
server.
Change this by actually sending out DHCP DISCOVER packets instead of the
generic (mostly empty) BOOTP BOOTREQUEST packets.
A pure BOOTP server would ignore the extra DHCP options in the DISCOVER
packet and would just reply with a BOOTREPLY packet, which we also
handle in the code.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Allow receiving DHCP OFFER and ACK packets
In respone to a BOOTREQUEST packet a BOOTP server would answer with a BOO
TREPLY
packet, which ends the conversation for good. DHCP uses a 4-way handshake
,
where the initial server respone is an OFFER, which has to be answered wi
th
REQUEST by the client again, only to be completed by an ACKNOWLEDGE packe
t
from the server.
Teach the grub_net_process_dhcp() function to deal with OFFER packets,
and treat ACK packets the same es BOOTREPLY packets.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Use DHCP options for name and bootfile
The BOOTP RFC describes the boot file name and the server name as being p
art
of the integral BOOTP data structure, with some limits on the size of the
m.
DHCP extends this by allowing them to be separate DHCP options, which is
more
flexible.
Teach the code dealing with those fields to check for those DHCP options
first
and use this information, if provided. We fall back to using the BOOTP
information if those options are not used.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Introduce per-interface timeout
Currently we have a global timeout for all network cards in the BOOTP/DHC
P
discovery process.
Make this timeout a per-interface one, so better accommodate the upcoming
4-way DHCP handshake and to also cover the lease time limit a DHCP offer
will come with.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Make grub_net_process_dhcp() take an interface
Change the interface of the function dealing with incoming BOOTP packets
to take an interface instead of a card, to allow more fine per-interface
state (timeout, handshake state) later on.
Use the opportunity to clean up the code a bit.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Refactor DHCP packet transmission into separate function
In contrast to BOOTP, DHCP uses a 4-way handshake, so requires to send
packets more often.
Refactor the generation and sending of the BOOTREQUEST packet into
a separate function, so that future code can more easily reuse this.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Allow overloading legacy bootfile and name field
DHCP specifies a special dummy option OVERLOAD, to allow DHCP options to
spill over into the (legacy) BOOTFILE and SNAME fields.
Parse and handle this option properly.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Replace parse_dhcp_vendor() with find_dhcp_option()
For proper DHCP support we will need to parse DHCP options from a packet
more often and at various places.
Refactor the option parsing into a new function, which will scan a packet
to
find *a particular* option field. Use that new function in places where w
e
were dealing with DHCP options before.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Andrei Borzenkov <arvidjaar@gmail.com>
net/dhcp: Remove dead code
The comment is right, the "giaddr" fields holds the IP address of the BOO
TP
relay, not a general purpose router address. Just remove the commented co
de,
archeologists can find it in the git history.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Jesús Diéguez Fernández <jesusdf@gmail.com>
msr: Add new MSR modules (rdmsr/wrmsr)
In order to be able to read from and write to model-specific registers,
two new modules are added. They are i386 specific, as the cpuid module.
rdmsr module registers the command rdmsr that allows reading from a MSR.
wrmsr module registers the command wrmsr that allows writing to a MSR.
wrmsr module is disabled if UEFI secure boot is enabled.
Please note that on SMP systems, interacting with a MSR that has a scope
per hardware thread, implies that the value only applies to the
particular cpu/core/thread that ran the command.
Also, if you specify a reserved or unimplemented MSR address, it will
cause a general protection exception (which is not currently being
handled) and the system will reboot.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Jesús Diéguez Fernández <jesusdf@gmail.com>
asm: Replace "__asm__ __volatile__" with "asm volatile"
In order to maintain the coding style consistency, it was requested to
replace the methods that use "__asm__ __volatile__" with "asm volatile".
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: Add bios boot partition support
Add BIOS Boot Partition support for sparc64 platforms. This will work a
little different than x86. With GPT, both the OBP "load" and "boot" comm
ands
are partition aware and neither command can see the partition table. The
refore
the entire boot-loader is stored within the BIOS Boot Partition and nothi
ng
is stored within the bootstrap code area of MBR.
To use it, the end user will issue the boot command with the path pointin
g to
the BIOS Boot Partition.
For example with the disk below:
Model: Unknown (unknown)
Disk /dev/nvme1n1: 1600GB
Sector size (logical/physical): 512B/512B
Partition Table: gpt
Number Start End Size File system Name Flags
1 1049kB 1075MB 1074MB ext3
2 1075MB 1076MB 1049kB bios_grub
3 1076MB 1600GB 1599GB lvm
To boot grub2 from OBP, you would use:
boot /pci@302/pci@1/pci@0/pci@13/nvme@0/disk@1:b
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: obdisk driver
Add a new disk driver called obdisk for IEEE1275 platforms. Currently
the only platform using this disk driver is SPARC, however other IEEE1275
platforms could start using it if they so choose. While the functionalit
y
within the current IEEE1275 ofdisk driver may be suitable for PPC and x86
, it
presented too many problems on SPARC hardware.
Within the old ofdisk, there is not a way to determine the true canonical
name for the disk. Within Open Boot, the same disk can have multiple nam
es
but all reference the same disk. For example the same disk can be refere
nced
by its SAS WWN, using this form:
/pci@302/pci@2/pci@0/pci@17/LSI,sas@0/disk@w5000cca02f037d6d,0
It can also be referenced by its PHY identifier using this form:
/pci@302/pci@2/pci@0/pci@17/LSI,sas@0/disk@p0
It can also be referenced by its Target identifier using this form:
/pci@302/pci@2/pci@0/pci@17/LSI,sas@0/disk@0
Also, when the LUN=0, it is legal to omit the ,0 from the device name. S
o with
the disk above, before taking into account the device aliases, there are
6 ways
to reference the same disk.
Then it is possible to have 0 .. n device aliases all representing the sa
me disk.
Within this new driver the true canonical name is determined using the th
e
IEEE1275 encode-unit and decode-unit commands when address_cells == 4. T
his
will determine the true single canonical name for the device so multiple
ihandles
are not opened for the same device. This is what frequently happens with
the old
ofdisk driver. With some devices when they are opened multiple times it
causes
the entire system to hang.
Another problem solved with this driver is devices that do not have a dev
ice
alias can be booted and used within GRUB. Within the old ofdisk, this was
not
possible, unless it was the original boot device. All devices behind a S
AS
or SCSI parent can be found. Within the old ofdisk, finding these disks
relied on there being an alias defined. The alias requirement is not
necessary with this new driver. It can also find devices behind a parent
after they have been hot-plugged. This is something that is not possible
with the old ofdisk driver.
The old ofdisk driver also incorrectly assumes that the device pointing t
o by a
device alias is in its true canonical form. This assumption is never made
with
this new driver.
Another issue solved with this driver is that it properly caches the ihan
dle
for all open devices. The old ofdisk tries to do this by caching the las
t
opened ihandle. However this does not work properly because the layer ab
ove
does not use a consistent device name for the same disk when calling into
the
driver. This is because the upper layer uses the bootpath value returned
within
/chosen, other times it uses the device alias, and other times it uses th
e
value within grub.cfg. It does not have a way to figure out that these d
evices
are the same disk. This is not a problem with this new driver.
Due to the way GRUB repeatedly opens and closes the same disk. Caching th
e
ihandle is important on SPARC. Without caching, some SAS devices can tak
e
15 - 20 minutes to get to the GRUB menu. This ihandle caching is not poss
ible
without correctly having the canonical disk name.
When available, this driver also tries to use the deblocker #blocks and
a way of determining the disk size.
Finally and probably most importantly, this new driver is also capable of
seeing all partitions on a GPT disk. With the old driver, the GPT
partition table can not be read and only the first partition on the disk
can be seen.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-12 Paul Menzel <pmenzel@molgen.mpg.de>
Makefile: Allow to set file systems modules for default_payload.elf
By default all file system modules are added to the GRUB coreboot
payload `default_payload.elf`. This makes the image quite big,
especially as often not all modules are needed.
Introduce the variable `FS_PAYLOAD_MODULES`, which can be used to
explicitly set file systems modules to be added.
$ make default_payload.elf
test -f default_payload.elf && rm default_payload.elf || true
pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i38
6-coreboot -o default_payload.elf --modules='ahci pata ehci uhci ohci usb_keyboa
rd usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --ins
tall-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd l
smmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial m
ultiboot cbmemc linux16 gzio echo help syslinuxcfg xnu affs afs bfs btrfs cbfs c
pio cpio_be exfat ext2 f2fs fat hfs hfsplus iso9660 jfs minix minix2 minix2_be m
inix3 minix3_be minix_be newc nilfs2 ntfs odc procfs reiserfs romfs sfs squash4
tar udf ufs1 ufs1_be ufs2 xfs zfs password_pbkdf2 ' --fonts= --themes= --locales
= -d grub-core/ /boot/grub/grub.cfg=./coreboot.cfg
$ ls -l default_payload.elf
-rw-rw---- 1 joey joey 1199568 Mar 6 13:58 default_payload.elf
$ make default_payload.elf FS_PAYLOAD_MODULES="" # ext2 already in `-
-modules`
test -f default_payload.elf && rm default_payload.elf || true
pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i38
6-coreboot -o default_payload.elf --modules='ahci pata ehci uhci ohci usb_keyboa
rd usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --ins
tall-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd l
smmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial m
ultiboot cbmemc linux16 gzio echo help syslinuxcfg xnu password_pbkdf2 ' --font
s= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=./coreboot.cfg
$ ls -l default_payload.elf
-rw-rw---- 1 joey joey 832976 Mar 7 12:13 default_payload.elf
So, the resulting payload size is around 370 kB smaller. (Adding it to
the CBFS, it will be compressed, so the effective size difference will
be smaller.)
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-07 Vladimir Serbinenko <phcoder@gmail.com>
windows/platform.c: Fix compilation errors
2019-03-05 Colin Watson <cjwatson@ubuntu.com>
gnulib: Upgrade Gnulib and switch to bootstrap tool
Upgrade Gnulib files to 20190105.
It's much easier to maintain GRUB's use of portability support files
from Gnulib when the process is automatic and driven by a single
configuration file, rather than by maintainers occasionally running
gnulib-tool and committing the result. Removing these
automatically-copied files from revision control also removes the
temptation to hack the output in ways that are difficult for future
maintainers to follow. Gnulib includes a "bootstrap" program which is
designed for this.
The canonical way to bootstrap GRUB from revision control is now
"./bootstrap", but "./autogen.sh" is still useful if you just want to
generate the GRUB-specific parts of the build system.
GRUB now requires Autoconf >= 2.63 and Automake >= 1.11, in line with
Gnulib.
Gnulib source code is now placed in grub-core/lib/gnulib/ (which should
not be edited directly), and GRUB's patches are in
grub-core/lib/gnulib-patches/. I've added a few notes to the developer
manual on how to maintain this.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-05 Colin Watson <cjwatson@ubuntu.com>
syslinux: Fix syslinux_test in out-of-tree builds
syslinux_parse simplifies some filenames by removing things like ".."
segments, but the tests assumed that @abs_top_srcdir@ would be
untouched, which is not true in the case of out-of-tree builds where
@abs_top_srcdir@ may contain ".." segments.
Performing the substitution requires some awkwardness in Makefile.am due
to details of how config.status works.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-05 Colin Watson <cjwatson@ubuntu.com>
util: Detect more I/O errors
Many of GRUB's utilities don't check anywhere near all the possible
write errors. For example, if grub-install runs out of space when
copying a file, it won't notice. There were missing checks for the
return values of write, fflush, fsync, and close (or the equivalents on
other OSes), all of which must be checked.
I tried to be consistent with the existing logging practices of the
various hostdisk implementations, but they weren't entirely consistent
to start with so I used my judgement. The result at least looks
reasonable on GNU/Linux when I provoke a write error:
Installing for x86_64-efi platform.
grub-install: error: cannot copy `/usr/lib/grub/x86_64-efi-signed/grubx
64.efi.signed' to `/boot/efi/EFI/debian/grubx64.efi': No space left on device.
There are more missing checks in other utilities, but this should fix
the most critical ones.
Fixes Debian bug #922741.
Reviewed-by: Steve McIntyre <93sam@debian.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-03-05 James Clarke <jrtc27@jrtc27.com>
osdep/freebsd: Fix partition calculation for EBR entries
For EBR partitions, "start" is the relative starting sector of the EBR
header itself, whereas "offset" is the relative starting byte of the
partition's contents, excluding the EBR header and any padding. Thus we
must use "offset", and divide by the sector size to convert to sectors.
Fixes Debian bug #923253.
Reviewed-by: Colin Watson <cjwatson@ubuntu.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-26 Steve McIntyre <93sam@debian.org>
grub-install: Check for arm-efi as a default target
Much like on x86, we can work out if the system is running on top of EFI
firmware. If so, return "arm-efi". If not, fall back to "arm-uboot" as
previously.
Split out the code to (maybe) load the efivar module and check for
/sys/firmware/efi into a common helper routine is_efi_system().
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-26 Daniel Kiper <daniel.kiper@oracle.com>
Revert "grub-install: Check for arm-efi as a default target"
This reverts commit 082fd84d525f8d6602f892160b77c0a948308a78.
Incorrect version of the patch was pushed into the git repo.
Reported-by: Leif Lindholm <leif.lindholm@linaro.org>
2019-02-25 Alexander Graf <agraf@suse.de>
travis: Add Travis CI config file
There is a really convenient service for open source project from Travis
CI: They allow for free CI testing using their infrastructure.
GRUB has had issues with broken builds for various targets for a long tim
e
already. The main reason is a lack of CI to just do smoke tests on whethe
r
all targets still at least compile.
This patch adds a Travis config file which builds (almost) all currently
available targets.
On top of that, this Travis config also runs a small execution test on th
e
x86_64-efi target.
All of this config file can easily be extended further on. It probably
makes sense to do something similar to the u-boot test infrastructure
that communicates with the payload properly. Going forward, we also will
want to do more QEMU runtime checks for other targets.
Currently, with this config alone, I already see about half of the availa
ble
targets as broken. So it's definitely desperately needed :).
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Steve McIntyre <93sam@debian.org>
grub-install: Check for arm-efi as a default target
Much like on x86, we can work out if the system is running on top
of EFI firmware. If so, return "arm-efi". If not, fall back to
"arm-uboot" as previously.
Heavily inspired by the existing code for x86.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Leif Lindholm <leif.lindholm@linaro.org>
arm64/efi: Fix grub_efi_get_ram_base()
grub_efi_get_ram_base() looks for the lowest available RAM address by
traversing the memory map, comparing lowest address found so far.
Due to a brain glitch, that "so far" was initialized to GRUB_UINT_MAX -
completely preventing boot on systems without RAM below 4GB.
Change the initial value to GRUB_EFI_MAX_USABLE_ADDRESS, as originally
intended.
Reported-by: Steve McIntyre <93sam@debian.org>
Tested-by: Steve McIntyre <93sam@debian.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Paul Menzel <pmenzel@molgen.mpg.de>
normal/menu: Do not treat error values as key presses
Some terminals, like `grub-core/term/at_keyboard.c`, return `-1` in case
they are not ready yet.
if (! KEYBOARD_ISREADY (grub_inb (KEYBOARD_REG_STATUS)))
return -1;
Currently, that is treated as a key press, and the menu time-out is
cancelled/cleared. This is unwanted, as the boot is stopped and the user
manually has to select a menu entry. Therefore, adapt the condition to
require the key value also to be greater than 0.
`GRUB_TERM_NO_KEY` is defined as 0, so the condition could be collapsed
to greater or equal than (≥) 0, but the compiler will probably do that
for us anyway, so keep the cases separate for clarity.
This is tested with coreboot, the GRUB default payload, and the
configuration file `grub.cfg` below.
For GRUB:
$ ./autogen.sh
$ ./configure --with-platform=coreboot
$ make -j`nproc`
$ make default_payload.elf
For coreboot:
$ more grub.cfg
serial --unit 0 --speed 115200
set timeout=5
menuentry 'halt' {
halt
}
$ build/cbfstool build/coreboot.rom add-payload \
-f /dev/shm/grub/default_payload.elf -n fallback/payload -c lzma
$ build/cbfstool build/coreboot.rom add -f grub.cfg -n etc/grub.cfg -
t raw
$ qemu-system-x86_64 --version
QEMU emulator version 3.1.0 (Debian 1:3.1+dfsg-2+b1)
Copyright (c) 2003-2018 Fabrice Bellard and the QEMU Project develope
rs
$ qemu-system-x86_64 -M pc -bios build/coreboot.rom -serial stdio -ni
c none
Currently, the time-out is cancelled/cleared. With the commit, it is not.
With a small GRUB payload, this the problem is also reproducible on the
ASRock E350M1.
Link: http://lists.gnu.org/archive/html/grub-devel/2019-01/msg00037.html
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
fdt: Treat device tree file type like ACPI
We now have signature check logic in grub which allows us to treat
files differently depending on their file type.
Treat a loaded device tree like an overlayed ACPI table.
Both describe hardware, so I suppose their threat level is the same.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
2019-02-25 Alexander Graf <agraf@suse.de>
RISC-V: Add to build system
This patch adds support for RISC-V to the grub build system. With this
patch, I can successfully build grub on RISC-V as a UEFI application.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
RISC-V: Add libgcc helpers for clz
Gcc may decide it wants to call helper functions to execute clz. Provide
them in our own copy of libgcc.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
RISC-V: Add auxiliary files
To support a new architecture we need to provide a few helper functions
for memory, cache, timer, etc support.
This patch adds the remainders of those. Some bits are still disabled,
as I couldn't guarantee that we're always running on models / in modes
where the respective hardware is available.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
RISC-V: Add awareness for RISC-V reloations
This patch adds awareness of RISC-V relocations throughout the grub tools
as well as dynamic linkage and elf->PE relocation conversion support.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
RISC-V: Add Linux load logic
We currently only support to run grub on RISC-V as UEFI payload. Ideally,
we also only want to support running Linux underneath as UEFI payload.
Prepare that with some Linux boot stub code. Once the arm64 target is
generalized, we can hook into that one and gain boot functionality.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
RISC-V: Add early startup code
On entry, we need to save the system table pointer as well as our image
handle. Add an early startup file that saves them and then brings us
into our main function.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
RISC-V: Add setjmp implementation
This patch adds a 32/64 capable setjmp implementation for RISC-V.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
elf.h: Add RISC-V definitions
The RISC-V ABI document outlines ELF header structure and relocation
information. Pull the respective magic numbers into our elf header
so we can make use of them.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
PE: Add RISC-V definitions
The PE format defines magic numbers as well as relocation identifiers for
RISC-V. Add them to our include file, so we can make use of them.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-25 Alexander Graf <agraf@suse.de>
efi: Rename armxx to arch
Some architectures want to boot Linux as plain UEFI binary. Today that
really only encompasses ARM and AArch64, but going forward more
architectures may adopt that model.
So rename our internal API accordingly.
Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-02-06 Alexander Graf <agraf@suse.de>
mkimage: Clarify file alignment in efi case
There are a few spots in the PE generation code for EFI binaries that use
s
the section alignment rather than file alignment, even though the alignme
nt
is really only file bound.
Replace those cases with the file alignment constant instead.
Reported-by: Daniel Kiper <dkiper@net-space.pl>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Julien ROBIN <julien.robin28@free.fr>
2019-02-06 Alexander Graf <agraf@suse.de>
mkimage: Align efi sections on 4k boundary
There is UEFI firmware popping up in the wild now that implements stricte
r
permission checks using NX and write protect page table entry bits.
This means that firmware now may fail to load binaries if its individual
sections are not page aligned, as otherwise it can not ensure permission
boundaries.
So let's bump all efi section alignments up to 4k (EFI page size). That w
ay
we will stay compatible going forward.
Unfortunately our internals can't deal very well with a mismatch of align
ment
between the virtual and file offsets, so we have to also pad our target
binary a bit.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Julien ROBIN <julien.robin28@free.fr>
2019-02-06 Alexander Graf <agraf@suse.de>
mkimage: Use EFI32_HEADER_SIZE define in arm-efi case
The efi-arm case was defining its own header size calculation, even thoug
h it's
100% identical to the common EFI32_HEADER_SIZE definition.
So let's clean it up to use the common define.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Julien ROBIN <julien.robin28@free.fr>
2019-02-06 Guillaume GARDET <guillaume.gardet@arm.com>
arm: Move initrd upper to leave more space for kernel
This patch allows to have bigger kernels. If the kernel grows, then it wi
ll
overwrite the initrd when it is extracted.
Acked-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-01-23 Leif Lindholm <leif.lindholm@linaro.org>
linux, efi, arm*, fdt: Break FDT extra allocation space out into a #defin
e
A certain amount of dynamic space is required for the handover from
GRUB/Linux-EFI-stub. This entails things like initrd addresses,
address-cells entries and associated strings.
But move this into a proper centralised #define rather than live-code
it in the loader.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-01-22 Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
uboot: Add the missing disk write operation support
uboot_disk_write() is currently lacking the write support
to storage devices because, historically, those devices did not
implement block_write() in U-Boot.
The solution has been tested using a patched U-Boot loading
and booting GRUB in a QEMU vexpress-a9 environment.
The disk write operations were triggered with GRUB's save_env
command.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-01-21 Max Tottenham <mtottenh@akamai.com>
tpm: Fix bug in GRUB2 TPM module
The value of tpm_handle changes between successive calls to grub_tpm_hand
le_find(),
as instead of simply copying the stored pointer we end up taking the addr
ess of
said pointer when using the cached value of grub_tpm_handle.
This causes grub_efi_open_protocol() to return a nullptr in grub_tpm2_exe
cute()
and grub_tpm2_log_event(). Said nullptr goes unchecked and
efi_call_5(tpm->hash_log_extend_event,...) ends up jumping to 0x0, Qemu c
rashes
once video ROM is reached at 0xb0000.
This patch seems to do the trick of fixing that bug, but we should also e
nsure
that all calls to grub_efi_open_protocol() are checked so that we don't s
tart
executing low memory.
Reviewed-by: Matthew Garrett <mjg59@google.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-01-14 Colin Watson <cjwatson@ubuntu.com>
pgp: Fix emu build and tests after pgp module renaming
Commit b07feb8746c3bb845e3f0d33d37c0bded704d14d (verifiers: Rename
verify module to pgp module) renamed the "verify" module to "pgp", but
the GRUB_MOD_INIT and GRUB_MOD_FINI macros were left as "verify", which
broke the emu target build; and file_filter_test still referred to the
now non-existent "verify" module. Fix both of these.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-01-14 Peter Große <pegro@friiks.de>
grub-mkconfig/20_linux_xen: Support multiple early initrd images
Add support for multiple, shared, early initrd images. These early
images will be loaded in the order declared, and all will be loaded
before the initrd image.
While many classes of data can be provided by early images, the
immediate use case would be for distributions to provide CPU
microcode to mitigate the Meltdown and Spectre vulnerabilities.
Xen has also support to load microcode updates provided as additional
modules by the bootloader.
There are two environment variables provided for declaring the early
images.
* GRUB_EARLY_INITRD_LINUX_STOCK is for the distribution declare
images that are provided by the distribution or installed packages.
If undeclared, this will default to a set of common microcode image
names.
* GRUB_EARLY_INITRD_LINUX_CUSTOM is for user created images. User
images will be loaded after the stock images.
These separate configurations allow the distribution and user to
declare different image sets without clobbering each other.
This also makes a minor update to ensure that UUID partition labels
stay disabled when no initrd image is found, even if early images are
present.
This is basically a copy of a698240d "grub-mkconfig/10_linux: Support
multiple early initrd images" by Matthew S. Turnbull.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2019-01-14 Heinrich Schuchardt <xypron.glpk@gmx.de>
grub-core/loader/efi/fdt.c: Do not copy random memory
We should not try to copy any memory area which is outside of the origina
l
fdt. If this extra memory is controlled by a hypervisor this might end
with a crash.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-12-12 Matthew Garrett <matthewgarrett@google.com>
verifiers: Add TPM documentation
Describe the behaviour of GRUB when the TPM module is in use.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-12-12 Matthew Garrett <mjg59@google.com>
verifiers: Core TPM support
Add support for performing basic TPM measurements. Right now this only
supports extending PCRs statically and only on UEFI. In future we might
want to have some sort of mechanism for choosing which events get logged
to which PCRs, but this seems like a good default policy and we can wait
to see whether anyone has a use case before adding more complexity.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-12-12 Matthew Garrett <mjg59@google.com>
verifiers: Verify commands executed by grub
Pass all commands executed by GRUB to the verifiers layer. Most verifiers
will
ignore this, but some (such as the TPM verifier) want to be able to measu
re and
log each command executed in order to ensure that the boot state is as ex
pected.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-12-12 Juergen Gross <jgross@suse.com>
xen_pvh: Add support to configure
Support platform i386/xen_pvh in configure.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen_pvh: Support grub-install for xen_pvh
Add xen_pvh support to grub-install.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen_pvh: Support building a standalone image
Support mkimage for xen_pvh.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Use elfnote defines instead of plain numbers
In order to avoid using plain integers for the ELF notes use the
available Xen include instead.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Hans van Kranenburg <hans@knorrie.org>
grub-module-verifier: Ignore all_video for xen_pvh
This solves the build failing with "Error: no symbol table and no
.moddeps section"
Also see:
- 6371e9c10433578bb236a8284ddb9ce9e201eb59
- https://savannah.gnu.org/bugs/?49012
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen_pvh: Add build runes for grub-core
Add the modifications to the build system needed to build a xen_pvh
grub.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Init memory regions for PVH
Add all usable memory regions to grub memory management and add the
needed mmap iterate code, which will be used by grub core (e.g.
grub-core/lib/relocator.c or grub-core/mmap/mmap.c).
As we are running in 32-bit mode don't add memory above 4GB.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Setup Xen specific data for PVH
Initialize the needed Xen specific data. This is:
- the Xen start of day page containing the console and Xenstore ring
page PFN and event channel
- the grant table
- the shared info page
Write back the possibly modified memory map to the hypervisor in case
the guest is reading it from there again.
Set the RSDP address for the guest from the start_info page passed
as boot parameter.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Get memory map from hypervisor for PVH
Retrieve the memory map from the hypervisor and normalize it to contain
no overlapping entries and to be sorted by address.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Setup hypercall page for PVH
Add the needed code to setup the hypercall page for calling into the
Xen hypervisor.
Import the XEN_HVM_DEBUGCONS_IOPORT define from Xen unstable into
include/xen/arch-x86/xen.h
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Add PVH boot entry code
Add the code for the Xen PVH mode boot entry.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Add basic hooks for PVH in current code
Add the hooks to current code needed for Xen PVH. They will be filled
with code later when the related functionality is being added.
loader/i386/linux.c needs to include machine/kernel.h now as it needs
to get GRUB_KERNEL_USE_RSDP_ADDR from there. This in turn requires to
add an empty kernel.h header for some i386 platforms (efi, coreboot,
ieee1275, xen) and for x86_64 efi.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Add PVH specific defines to offset.h
include/grub/offsets.h needs some defines for Xen PVH mode.
Add them. While at it line up the values in the surrounding lines to
start at the same column.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Modify grub_xen_ptr2mfn() for Xen PVH
grub_xen_ptr2mfn() returns the machine frame number for a given pointer
value. For Xen-PVH guests this is just the PFN. Add the PVH specific
variant.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Rearrange xen/init.c to prepare it for Xen PVH mode
Rearrange grub-core/kern/xen/init.c to prepare adding PVH mode support
to it. This includes putting some code under #ifdef GRUB_MACHINE_XEN
as it will not be used when running as PVH.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Add some dummy headers for PVH mode
With Xen PVH mode adding a new machine type the machine related headers
need to be present for the build to succeed. Most of the headers just
need to include the related common i386 headers. Add those to the tree.
Note that xen_pvh/int.h needs to include pc/int_types.h instead of
pc/int.h in order to avoid the definition of grub_bios_interrupt().
xen_pvh/memory.h needs to include coreboot/memory.h (like some other
<machine>/memory.h do as well) as this contains just the needed stubs.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Prepare common code for Xen PVH support
Some common code needs to be special cased for Xen PVH mode. This hits
mostly Xen PV mode specific areas.
Split include/grub/i386/pc/int_types.h off from
include/grub/i386/pc/int.h to support including this file later from
xen_pvh code without the grub_bios_interrupt definition.
Move definition of struct grub_e820_mmap_entry from
grub-core/mmap/i386/pc/mmap.c to include/grub/i386/memory.h in order
to make it usable from xen_pvh code.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Carve out grant tab initialization into dedicated function
Initialize the grant tab in a dedicated function. This will enable
using it for PVH guests, too.
Call the new function from grub_machine_init() as this will later
be common between Xen PV and Xen PVH mode.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
loader/linux: Support passing RSDP address via boot params
Xen PVH guests will have the RSDP at an arbitrary address. Support that
by passing the RSDP address via the boot parameters to Linux.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-12 Juergen Gross <jgross@suse.com>
xen: Add some Xen headers
In order to support grub2 in Xen PVH environment some additional Xen
headers are needed as grub2 will be started in PVH mode requiring to
use several HVM hypercalls and structures.
Add the needed headers from Xen 4.10 being the first Xen version with
full (not only experimental) PVH guest support.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Hans van Kranenburg <hans@knorrie.org>
2018-12-07 Daniel Kiper <daniel.kiper@oracle.com>
verifiers: ARM Xen fallout cleanup
ARM Xen fallout cleanup after commit ca0a4f689 (verifiers: File type for
fine-grained signature-verification controlling).
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-12-07 Daniel Kiper <daniel.kiper@oracle.com>
verifiers: Xen fallout cleanup
Xen fallout cleanup after commit ca0a4f689 (verifiers: File type for
fine-grained signature-verification controlling).
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-28 Eric Snowberg <eric.snowberg@oracle.com>
ofnet: Fix build regression in grub_ieee1275_parse_bootpath()
The grub_ieee1275_parse_bootpath() function (commit a661a32, ofnet: Initi
alize
structs in bootpath parser) introduces a build regression on SPARC:
cc1: warnings being treated as errors
net/drivers/ieee1275/ofnet.c: In function 'grub_ieee1275_parse_bootpath':
net/drivers/ieee1275/ofnet.c:156: error: missing initializer
net/drivers/ieee1275/ofnet.c:156: error: (near initialization for 'client
_addr.type')
net/drivers/ieee1275/ofnet.c:156: error: missing initializer
net/drivers/ieee1275/ofnet.c:156: error: (near initialization for 'gatewa
y_addr.type')
net/drivers/ieee1275/ofnet.c:156: error: missing initializer
net/drivers/ieee1275/ofnet.c:156: error: (near initialization for 'subnet
_mask.type')
net/drivers/ieee1275/ofnet.c:157: error: missing initializer
net/drivers/ieee1275/ofnet.c:157: error: (near initialization for 'hw_add
r.type')
make[3]: *** [net/drivers/ieee1275/ofnet_module-ofnet.o] Error 1
Initialize the entire structure.
More info can be found here:
http://lists.gnu.org/archive/html/grub-devel/2018-03/msg00034.html
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-26 Nick Terrell <terrelln@fb.com>
btrfs: Add zstd support to grub btrfs
- Adds zstd support to the btrfs module.
- Adds a test case for btrfs zstd support.
- Changes top_srcdir to srcdir in the btrfs module's lzo include
following comments from Daniel Kiper about the zstd include.
Tested on Ubuntu-18.04 with a btrfs /boot partition with and without zstd
compression. A test case was also added to the test suite that fails befo
re
the patch, and passes after.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-26 Nick Terrell <terrelln@fb.com>
zstd: Import upstream zstd-1.3.6
- Import zstd-1.3.6 from upstream
- Add zstd's module.c file
- Add the zstd module to Makefile.core.def
Import zstd-1.3.6 from upstream [1]. Only the files need for decompressio
n
are imported. I used the latest zstd release, which includes patches [2]
to
build cleanly in GRUB.
I included the script used to import zstd-1.3.6 below at the bottom of th
e
commit message.
Upstream zstd commit hash: 4fa456d7f12f8b27bd3b2f5dfd4f46898cb31c24
Upstream zstd commit name: Merge pull request #1354 from facebook/dev
Zstd requires some posix headers, which it gets from posix_wrap.
This can be checked by inspecting the .Po files generated by automake,
which contain the header dependencies. After building run the command
`cat grub-core/lib/zstd/.deps-core/*.Po` to see the dependencies [3].
The only OS dependencies are:
- stddef.h, which is already a dependency in posix_wrap, and used for siz
e_t
by lzo and xz.
- stdarg.h, which comes from the grub/misc.h header, and we don't use in
zstd.
All the types like uint64_t are typedefed to grub_uint64_t under the hood
.
The only exception is size_t, which comes from stddef.h. This is already
the
case for lzo and xz. I don't think there are any cross-compilation concer
ns,
because cross-compilers provide their own system headers (and it would al
ready
be broken).
[1] https://github.com/facebook/zstd/releases/tag/v1.3.6
[2] https://github.com/facebook/zstd/pull/1344
[3] https://gist.github.com/terrelln/7a16b92f5a1b3aecf980f944b4a966c4
```
curl -L -O https://github.com/facebook/zstd/releases/download/v1.3.6/zstd
-1.3.6.tar.gz
curl -L -O https://github.com/facebook/zstd/releases/download/v1.3.6/zstd
-1.3.6.tar.gz.sha256
sha256sum --check zstd-1.3.6.tar.gz.sha256
tar xzf zstd-1.3.6.tar.gz
SRC_LIB="zstd-1.3.6/lib"
DST_LIB="grub-core/lib/zstd"
rm -rf $DST_LIB
mkdir -p $DST_LIB
cp $SRC_LIB/zstd.h $DST_LIB/
cp $SRC_LIB/common/*.[hc] $DST_LIB/
cp $SRC_LIB/decompress/*.[hc] $DST_LIB/
rm $DST_LIB/{pool.[hc],threading.[hc]}
rm -rf zstd-1.3.6*
echo SUCCESS!
```
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-21 Michael Chang <mchang@suse.com>
verifiers: fix double close on pgp's sig file descriptor
An error emerged as when I was testing the verifiers branch, so instead
of putting it in pgp prefix, the verifiers is used to reflect what the
patch is based on.
While running verify_detached, grub aborts with error.
verify_detached /@/.snapshots/1/snapshot/boot/grub/grub.cfg
/@/.snapshots/1/snapshot/boot/grub/grub.cfg.sig
alloc magic is broken at 0x7beea660: 0
Aborted. Press any key to exit.
The error is caused by sig file descriptor been closed twice, first time
in grub_verify_signature() to which it is passed as parameter. Second in
grub_cmd_verify_signature() or in whichever opens the sig file
descriptor. The second close is not consider as bug to me either, as in
common rule of what opens a file has to close it to avoid file
descriptor leakage.
After all the design of grub_verify_signature() makes it difficult to kee
p
a good trace on opened file descriptor from it's caller. Let's refine
the application interface to accept file path rather than descriptor, in
this way the caller doesn't have to care about closing the descriptor by
delegating it to grub_verify_signature() with full tracing to opened
file descriptor by itself.
Also making it clear that sig descriptor is not referenced in error
returning path of grub_verify_signature_init(), so it can be closed
directly by it's caller. This also makes delegating it to
grub_pubkey_close() infeasible to help in relieving file descriptor
leakage as it has to depend on uncertainty of ctxt fields in error
returning path.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-21 Lee Jones <lee.jones@linaro.org>
generic/blocklist: Fix implicit declaration of function grub_file_filter_
disable_compression()
grub_file_filter_disable_compression() no longer exists.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-21 Lee Jones <lee.jones@linaro.org>
arm64/xen: Fix too few arguments to function grub_create_loader_cmdline()
Without this fix, building xen_boot.c omits:
loader/arm64/xen_boot.c: In function ‘xen_boot_binary_load’:
loader/arm64/xen_boot.c:370:7: error: too few arguments to function ‘grub
_create_loader_cmdline’
grub_create_loader_cmdline (argc - 1, argv + 1, binary->cmdline,
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from loader/arm64/xen_boot.c:36:0:
../include/grub/lib/cmdline.h:29:12: note: declared here
grub_err_t grub_create_loader_cmdline (int argc, char *argv[], char *buf
,
Reviewed-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-16 Leif Lindholm <leif.lindholm@linaro.org>
arm-uboot, ia64, sparc64: Fix up grub_file_open() calls
The verifiers framework changed the grub_file_open() interface, breaking
all
non-x86 linux loaders. Add file types to the grub_file_open() calls to ma
ke
them build again.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-16 Leif Lindholm <leif.lindholm@linaro.org>
arm64/efi: Fix breakage caused by verifiers
- add variable "err" (used but not defined),
- add GRUB_FILE_TYPE_LINUX_KERNEL to grub_file_open() call.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-16 Leif Lindholm <leif.lindholm@linaro.org>
grub-core/loader/efi/fdt.c: Fixup grub_file_open() call
The verifiers framework changed the API of grub_file_open(), but did not
fix up all users. Add the file type GRUB_FILE_TYPE_DEVICE_TREE_IMAGE
to the "devicetree" command handler call.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-16 Leif Lindholm <leif.lindholm@linaro.org>
include/grub/file.h: Add device tree file type
The API change of grub_file_open() for adding verifiers did not include
a type for device tree blobs. Add GRUB_FILE_TYPE_DEVICE_TREE_IMAGE to
the grub_file_type enum.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-16 Leif Lindholm <leif.lindholm@linaro.org>
include/grub/verify.h: Add include guard
verify.h was added without include guards. This means compiling anything
including both include/grub/verify.h and include/grub/lib/cmdline.h fails
(at least grub-core/loader/arm64/linux.c.
Add the necessary include guard.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-16 Matthew Daley <mattd@bugfuzz.com>
mkimage: Pad DTBs to target-specific pointer size
Device tree (DTB) lengths are being padded to a multiple of 4 bytes
rather than the target-specific pointer size. This causes objects
following OBJ_TYPE_DTB objects to be incorrectly parsed during GRUB
execution on arm64.
Fix by using ALIGN_ADDR(), not ALIGN_UP().
Signed-by-off: Matthew Daley <mattd@bugfuzz.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-09 Colin Watson <cjwatson@ubuntu.com>
Cope with / being on a ZFS root dataset
If / is on the root dataset in a ZFS pool, then ${bootfs} will be set to
"/" (whereas if it is on a non-root dataset, there will be no trailing
slash). Passing "root=ZFS=${rpool}/" will fail to boot, but
"root=ZFS=${rpool}" works fine, so strip the trailing slash.
Fixes: https://savannah.gnu.org/bugs/?52746
Tested-by: Fejes József <jozsef.fejes@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-09 Paul Menzel <pmenzel@molgen.mpg.de>
unix/platform: Initialize variable to fix grub-install on UEFI system
On a UEFI system, were no boot entry *grub* is present, currently,
`grub-install` fails with an error.
$ efibootmgr
BootCurrent: 0000
Timeout: 0 seconds
BootOrder: 0001,0006,0003,0004,0005
Boot0001 Diskette Drive
Boot0003* USB Storage Device
Boot0004* CD/DVD/CD-RW Drive
Boot0005 Onboard NIC
Boot0006* WDC WD2500AAKX-75U6AA0
$ sudo grub-install /dev/sda
Installing for x86_64-efi platform.
grub-install: error: efibootmgr failed to register the boot entry: Un
known error 22020.
The error code is always different, and the error message (incorrectly)
points to efibootmgr.
But, the error is in GRUB’s function
`grub_install_remove_efi_entries_by_distributor()`, where the variable
`rc` for the return value, is uninitialized and never set, when no boot
entry for the distributor is found.
The content of that uninitialized variable is then returned as the error
code of efibootmgr.
Set the variable to 0, so that success is returned, when no entry needs
to be deleted.
Tested on Dell OptiPlex 7010 with firmware A28.
$ sudo ./grub-install /dev/sda
Installing for x86_64-efi platform.
Installation finished. No error reported.
[1]: https://github.com/rhboot/efibootmgr/issues/100
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-11-09 Daniel Kiper <daniel.kiper@oracle.com>
efi: Add EFI shim lock verifier
This module provides shim lock verification for various kernels
if UEFI secure boot is enabled on a machine.
It is recommended to put this module into GRUB2 standalone image
(avoid putting iorw and memrw modules into it; they are disallowed
if UEFI secure boot is enabled). However, it is also possible to use
it as a normal module. Though such configurations are more fragile
and less secure due to various limitations.
If the module is loaded and UEFI secure boot is enabled then:
- module itself cannot be unloaded (persistent module),
- the iorw and memrw modules cannot be loaded,
- if the iorw and memrw modules are loaded then
machine boot is disabled,
- GRUB2 defers modules and ACPI tables verification to
other verifiers.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Daniel Kiper <daniel.kiper@oracle.com>
dl: Add support for persistent modules
This type of modules cannot be unloaded. This is useful if a given
functionality, e.g. UEFI secure boot shim signature verification, should
not be disabled if it was enabled at some point in time. Somebody may
say that we can use standalone GRUB2 here. That is true. However, the
code is not so big nor complicated hence it make sense to support
modularized configs too.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Vladimir Serbinenko <phcoder@gmail.com>
verifiers: Add the documentation
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Daniel Kiper <daniel.kiper@oracle.com>
verifiers: Rename verify module to pgp module
Just for clarity. No functional change.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Daniel Kiper <daniel.kiper@oracle.com>
verifiers: Add possibility to defer verification to other verifiers
This way if a verifier requires verification of a given file it can defer
task
to another verifier (another authority) if it is not able to do it itself
. E.g.
shim_lock verifier, posted as a subsequent patch, is able to verify only
PE
files. This means that it is not able to verify any of GRUB2 modules whic
h have
to be trusted on UEFI systems with secure boot enabled. So, it can defer
verification to other verifier, e.g. PGP one.
I silently assume that other verifiers are trusted and will do good job f
or us.
Or at least they will not do any harm.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Vladimir Serbinenko <phcoder@gmail.com>
verifiers: Add possibility to verify kernel and modules command lines
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Vladimir Serbinenko <phcoder@gmail.com>
verifiers: Framework core
Verifiers framework provides core file verification functionality which
can be used by various security mechanisms, e.g., UEFI secure boot, TPM,
PGP signature verification, etc.
The patch contains PGP code changes and probably they should be extracted
to separate patch for the sake of clarity.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Vladimir Serbinenko <phcoder@gmail.com>
verifiers: File type for fine-grained signature-verification controlling
Let's provide file type info to the I/O layer. This way verifiers
framework and its users will be able to differentiate files and verify
only required ones.
This is preparatory patch.
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-11-09 Daniel Kiper <daniel.kiper@oracle.com>
bufio: Use grub_size_t instead of plain int for size
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Add RAID 6 recovery for a btrfs filesystem
Add the RAID 6 recovery, in order to use a RAID 6 filesystem even if some
disks (up to two) are missing. This code use the md RAID 6 code already
present in grub.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Make more generic the code for RAID 6 rebuilding
The original code which handles the recovery of a RAID 6 disks array
assumes that all reads are multiple of 1 << GRUB_DISK_SECTOR_BITS and it
assumes that all the I/O is done via the struct grub_diskfilter_segment.
This is not true for the btrfs code. In order to reuse the native
grub_raid6_recover() code, it is modified to not call
grub_diskfilter_read_node() directly, but to call an handler passed
as an argument.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Add support for recovery for a RAID 5 btrfs profiles
Add support for recovery for a RAID 5 btrfs profile. In addition
it is added some code as preparatory work for RAID 6 recovery code.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Refactor the code that read from disk
Move the code in charge to read the data from disk into a separate
function. This helps to separate the error handling logic (which
depends on the different raid profiles) from the read from disk
logic. Refactoring this code increases the general readability too.
This is a preparatory patch, to help the adding of the RAID 5/6 recovery
code.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Move logging code in grub_btrfs_read_logical()
A portion of the logging code is moved outside of internal for(;;). The p
art
that is left inside is the one which depends on the internal for(;;) inde
x.
This is a preparatory patch. The next one will refactor the code inside
the for(;;) into an another function.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Avoid a rescan for a device which was already not found
Currently read from missing device triggers rescan. However, it is never
recorded that the device is missing. So, each read of a missing device
triggers rescan again and again. This behavior causes a lot of unneeded
rescans leading to huge slowdowns.
This patch fixes above mentioned issue. Information about missing devices
is stored in the data->devices_attached[] array as NULL value in dev
member. Rescan is triggered only if no information is found for a given
device. This means that only first time read triggers rescan.
The patch drops premature return. This way data->devices_attached[] is
filled even when a given device is missing.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Move the error logging from find_device() to its caller
The caller knows better if this error is fatal or not, i.e. another disk
is
available or not.
This is a preparatory patch.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Add helper to check the btrfs header
This helper is used in a few places to help the debugging. As
conservative approach the error is only logged.
This does not impact the error handling.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-10-31 Goffredo Baroncelli <kreijack@inwind.it>
btrfs: Add support for reading a filesystem with a RAID 5 or RAID 6 profi
le
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-27 Michael Chang <mchang@suse.com>
msdos: Fix overflow in converting partition start and length into 512B bl
ocks
When booting from NVME SSD with 4k sector size, it fails with the message
.
error: attempt to read or write outside of partition.
This patch fixes the problem by fixing overflow in converting partition s
tart
and length into 512B blocks.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-27 Mihai Moldovan <ionic@ionic.de>
osdep/linux: Convert partition start to disk sector length
When reading data off a disk, sector values are based on the disk sector
length.
Within grub_util_fd_open_device(), the start of the partition was taken
directly from grub's partition information structure, which uses the
internal sector length (currently 512b), but never transformed to the
disk's sector length.
Subsequent calculations were all wrong for devices that have a diverging
sector length and the functions eventually skipped to the wrong stream
location, reading invalid data.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-27 Adam Williamson <awilliam@redhat.com>
python: Use AM_PATH_PYTHON to determine interpreter for gentpl.py
gentpl.py is python2/3-agnostic, but there's no way to cause it
to be run with any interpreter other than 'python', it's just
hard-coded into Makefile.common that way. Adjust that to use
AM_PATH_PYTHON (provided by automake) to find an interpreter
and run gentpl.py with that instead. This makes grub buildable
when `python` does not exist (but rather `python3` or `python2`
or `python2.7`, etc.) Minimum version is set to 2.6 as this is
the first version with `__future__.print_function` available.
Note, AM_PATH_PYTHON respects the PYTHON environment variable
and will treat its value as the *only* candidate for a valid
interpreter if it is set - when PYTHON is set, AM_PATH_PYTHON
will not try to find any alternative interpreter, it will only
check whether the interpreter set as the value of PYTHON meets
the requirements and use it if so or fail if not. This means
that when using grub's `autogen.sh`, as it too uses the value
of the PYTHON environment variable (and if it is not set, just
sets it to 'python') you cannot rely on AM_PATH_PYTHON
interpreter discovery. If your desired Python interpreter is
not just 'python', you must set the PYTHON environment variable,
e.g. 'PYTHON=/usr/local/bin/python3 ./autogen.sh'. The specified
interpreter will then be used both by autogen.sh itself and by
the autotools-driven build scripts.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-27 Colin Watson <cjwatson@ubuntu.com>
build: Use pkg-config to find FreeType
pkg-config is apparently preferred over freetype-config these days (see
the BUGS section of freetype-config(1)). pkg-config support was added
to FreeType in version 2.1.5, which was released in 2003, so it should
comfortably be available everywhere by now.
We no longer need to explicitly substitute FREETYPE_CFLAGS and
FREETYPE_LIBS, since PKG_CHECK_MODULES does that automatically.
Fixes Debian bug #887721.
Reported-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-27 Colin Watson <cjwatson@ubuntu.com>
build: Capitalise *freetype_* variables
Using FREETYPE_CFLAGS and FREETYPE_LIBS is more in line with the naming
scheme used by pkg-config macros.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-13 Julian Andres Klode <julian.klode@canonical.com>
ofnet: Initialize structs in bootpath parser
Code later on checks if variables inside the struct are
0 to see if they have been set, like if there were addresses
in the bootpath.
The variables were not initialized however, so the check
might succeed with uninitialized data, and a new interface
with random addresses and the same name is added. This causes
$net_default_mac to point to the random one, so, for example,
using that variable to load per-mac config files fails.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1785859
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-13 dann frazier <dann.frazier@canonical.com>
grub-reboot: Warn when "for the next boot only" promise cannot be kept
The "for the next boot only" property of grub-reboot is dependent upon
GRUB being able to clear the next_entry variable in the environment
block. However, GRUB cannot write to devices using the diskfilter
and lvm abstractions.
Ref: https://lists.gnu.org/archive/html/grub-devel/2009-12/msg00276.html
Ref: https://bugs.launchpad.net/bugs/788298
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-13 Cao jin <caoj.fnst@cn.fujitsu.com>
relocator16: Comments update
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-13 Paul Menzel <pmenzel@molgen.mpg.de>
ahci: Increase time-out from 10 s to 32 s
This is a cryptographically signed message in MIME format.
Date: Thu, 9 Aug 2018 07:27:35 +0200
Currently, the GRUB payload for coreboot does not detect the Western
Digital hard disk WDC WD20EARS-60M AB51 connected to the ASRock E350M1,
as that takes over ten seconds to spin up.
```
disk/ahci.c:533: port 0, err: 0
disk/ahci.c:539: port 0, err: 0
disk/ahci.c:543: port 0, err: 0
disk/ahci.c:549: port 0, offset: 120, tfd:80, CMD: 6016
disk/ahci.c:552: port 0, err: 0
disk/ahci.c:563: port 0, offset: 120, tfd:80, CMD: 6016
disk/ahci.c:566: port: 0, err: 0
disk/ahci.c:593: port 0 is busy
disk/ahci.c:621: cleaning up failed devs
```
GRUB detects the drive, when either unloading the module *ahci*, and
then loading it again, or when doing a warm reset.
As the ten second time-out is too short, increase it to 32 seconds,
used by SeaBIOS. which detects the drive successfully.
The AHCI driver in libpayload uses 30 seconds, and that time-out was
added in commit 354066e1 (libpayload: ahci: Increase timeout for
signature reading) with the description below.
> We can't read the drives signature before it's ready, i.e. spun up.
> So set the timeout to the standard 30s. Also put a notice on the
> console, so the user knows why the signature reading failed.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-13 Cao jin <caoj.fnst@cn.fujitsu.com>
linux16: Code cleanup
1. move relocator related code more close to each other
2. use variable "len" since it has correct assignment, and keep coding
style with upper code
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-13 Colin Watson <cjwatson@ubuntu.com>
tests: Fix qemu options for UHCI test
qemu 2.12 removed the -usbdevice option. Use a more modern spelling
instead, in line with other USB-related tests.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-13 Colin Watson <cjwatson@ubuntu.com>
tests: Disable sercon in SeaBIOS
SeaBIOS 1.11.0 added support for VGA emulation over a serial port, which
interferes with grub-shell. Turn it off.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-12 Peter Jones <pjones@redhat.com>
grub-module-verifier: Report the filename or modname in errors
Make it so that when grub-module-verifier complains of an issue, it tells
you
which module the issue was with.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-12 Peter Jones <pjones@redhat.com>
configure: Fix an 8 year old typo
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-12 Leif Lindholm <leif.lindholm@linaro.org>
loader/multiboot_mbi2: Use central copy of grub_efi_find_mmap_size()
Delete local copy of function to determine required buffer size for the
UEFI memory map, use helper in kern/efi/mm.c.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-12 Leif Lindholm <leif.lindholm@linaro.org>
loader/ia64/linux: Use central copy of grub_efi_find_mmap_size()
Delete local copy of function to determine required buffer size for the
UEFI memory map, use helper in kern/efi/mm.c.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-09-12 Leif Lindholm <leif.lindholm@linaro.org>
loader/i386/linux: Use central copy of grub_efi_find_mmap_size()
Delete local copy of function to determine required buffer size for the
UEFI memory map, use helper in kern/efi/mm.c.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Leif Lindholm <leif.lindholm@linaro.org>
i386: Don't include lib/i386/reset.c in EFI builds
Commit 0ba90a7f0178 ("efi: Move grub_reboot() into kernel") broke
the build on i386-efi - genmoddep.awk bails out with message
grub_reboot in reboot is duplicated in kernel
This is because both lib/i386/reset.c and kern/efi/efi.c now provide
this function.
Rather than explicitly list each i386 platform variant in
Makefile.core.def, include the contents of lib/i386/reset.c only when
GRUB_MACHINE_EFI is not set.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Leif Lindholm <leif.lindholm@linaro.org>
efi: Restrict arm/arm64 linux loader initrd placement
The 32-bit arm Linux kernel is built as a zImage, which self-decompresses
down to near start of RAM. In order for an initrd/initramfs to be
accessible, it needs to be placed within the first ~768MB of RAM.
The initrd loader built into the kernel EFI stub restricts this down to
512MB for simplicity - so enable the same restriction in grub.
For arm64, the requirement is within a 1GB aligned 32GB window also
covering the (runtime) kernel image. Since the EFI stub loader itself
will attempt to relocate to near start of RAM, force initrd to be loaded
completely within the first 32GB of RAM.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Leif Lindholm <leif.lindholm@linaro.org>
arm: Delete unused efi support from loader/arm
The 32-bit arm efi port now shares the 64-bit linux loader, so delete
the now unused bits from the 32-bit linux loader.
This in turn leaves the grub-core/kern/arm/efi/misc.c unused, so
delete that too.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Leif Lindholm <leif.lindholm@linaro.org>
arm/efi: Switch to arm64 linux loader
The arm64 and arm linux kernel EFI-stub support presents pretty much
identical interfaces, so the same linux loader source can be used for
both architectures.
Switch 32-bit ARM UEFI platforms over to the existing EFI-stub aware
loader initially developed for arm64.
This *WILL* stop non-efistub Linux kernels from booting on arm-efi.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Leif Lindholm <leif.lindholm@linaro.org>
arm64/linux/loader: Rename functions and macros and move to common header
s
In preparation for using the linux loader for 32-bit and 64-bit platforms
,
rename grub_arm64*/GRUB_ARM64* to grub_armxx*/GRUB_ARMXX*.
Move prototypes for now-common functions to efi/efi.h.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Leif Lindholm <leif.lindholm@linaro.org>
efi: Add grub_efi_get_ram_base() function for arm64
Since ARM platforms do not have a common memory map, add a helper
function that finds the lowest address region with the EFI_MEMORY_WB
attribute set in the UEFI memory map.
Required for the arm64 efi linux loader to restrict the initrd
location to where it will be accessible by the kernel at runtime.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Leif Lindholm <leif.lindholm@linaro.org>
efi: Add central copy of grub_efi_find_mmap_size
There are several implementations of this function in the tree.
Add a central version in grub-core/efi/mm.c.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-25 Arindam Nath <arindam.nath@amd.com>
i386/linux: Add support for ext_lfb_base
The EFI Graphics Output Protocol can return a 64-bit
linear frame buffer address in some firmware/BIOS
implementations. We currently only store the lower
32-bits in the lfb_base. This will eventually be
passed to Linux kernel and the efifb driver will
incorrectly interpret the framebuffer address as
32-bit address.
The Linux kernel has already added support to handle
64-bit linear framebuffer address in the efifb driver
since quite some time now.
This patch adds the support for 64-bit linear frame
buffer address in GRUB to address the above mentioned
scenario.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-11 Leif Lindholm <leif.lindholm@linaro.org>
commands/file: Use definitions from arm64/linux.h
Clean up code for matching IS_ARM64 slightly by making use of struct
linux_arm64_kernel_header and GRUB_LINUX_ARM64_MAGIC_SIGNATURE.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-11 Leif Lindholm <leif.lindholm@linaro.org>
commands/file: Use definitions from arm/linux.h
Clean up code for matching IS_ARM slightly by making use of struct
linux_arm_kernel_header and GRUB_LINUX_ARM_MAGIC_SIGNATURE.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-11 Hans de Goede <hdegoede@redhat.com>
efi/console: Fix the "enter" key not working on x86 tablets
Most 8" or 7" x86 Windows 10 tablets come with volume up/down buttons and
a power-button. In their UEFI these are almost always mapped to arrow
up/down and enter.
Pressing the volume buttons (sometimes by accident) will stop the
menu countdown, but the power-button / "enter" key was not being recogniz
ed
as enter, so the user would be stuck at the grub menu.
The problem is that these tablets send scan_code 13 or 0x0d for the
power-button, which officialy maps to the F3 key. They also set
unicode_char to 0x0d.
This commit recognizes the special case of both scan_code and unicode_cha
r
being set to 0x0d and treats this as an enter key press.
This fixes things getting stuck at the grub-menu and allows the user
to choice a grub-menu entry using the buttons on the tablet.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-11 Cao jin <caoj.fnst@cn.fujitsu.com>
grub-setup: Debug message cleanup
Variable "root" is initialized after root device probing and is null in
current place, so, drop it.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-07-02 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
multiboot_elfxx.c: Fix compilation by fixing undeclared variable
Without that fix we have:
In file included from ../../include/grub/command.h:25:0,
from ../../grub-core/loader/multiboot.c:30:
../../grub-core/loader/multiboot_elfxx.c: In function 'grub_multiboot_l
oad_elf64':
../../grub-core/loader/multiboot_elfxx.c:130:28: error: 'relocatable' u
ndeclared (first use in this function)
"load_base_addr=0x%x\n", relocatable,
This happens due to mistake in the commit 14ec665
(mbi: Use per segment a separate relocator chunk).
So, let's fix it.
2018-06-23 Leif Lindholm <leif.lindholm@linaro.org>
efi/fdt: Set address/size cells to 2 for empty tree
When booting an arm* system on UEFI with an empty device tree (currently
only when hardware description comes from ACPI), we don't currently set
default to 1 cell (32 bits).
Set both of these properties, to 2 cells (64 bits), to resolve issues
with kexec on some platforms.
This change corresponds with linux kernel commit ae8a442dfdc4
("efi/libstub/arm*: Set default address and size cells values for an empt
y dtb")
and ensures booting through grub does not behave differently from booting
the stub loader directly.
See also https://patchwork.kernel.org/patch/9561201/
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-06-23 Leif Lindholm <leif.lindholm@linaro.org>
fdt: Move prop_entry_size to fdt.h
To be able to resuse the prop_entry_size macro, move it to
<grub/fdt.h> and rename it grub_fdt_prop_entry_size.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-06-23 Will Thompson <wjt@endlessm.com>
grub-fs-tester: Fix losetup race
If something else on the system is using loopback devices, then the
device that's free at the call to `losetup -f` may not be free in the
following call to try to use it. Instead, find and use the first free
loopback device in a single call to losetup.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-06-23 Alexander Boettcher <alexander.boettcher@genode-labs.com>
mbi: Use per segment a separate relocator chunk
Instead of setting up a all comprising relocator chunk for all segments,
use per segment a separate relocator chunk.
Currently, if the ELF is non-relocatable, a single relocator chunk will
comprise memory (between the segments) which gets overridden by the relst
()
invocation of the movers code in grub_relocator16/32/64_boot().
The overridden memory may contain reserved ranges like VGA memory or ACPI
tables, which may lead to crashes or at least to strange boot behaviour.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-06-05 Daniel Kiper <daniel.kiper@oracle.com>
templates: Add missing "]"
Commit 51be337 (templates: Update grub script template files)
lacked one "]", so, add it.
Reported-by: Philip <philm@manjaro.org>
2018-05-29 Daniel Kiper <daniel.kiper@oracle.com>
xfs: Accept filesystem with sparse inodes
The sparse inode metadata format became a mkfs.xfs default in
xfsprogs-4.16.0, and such filesystems are now rejected by grub as
containing an incompatible feature.
In essence, this feature allows xfs to allocate inodes into fragmented
freespace. (Without this feature, if xfs could not allocate contiguous
space for 64 new inodes, inode creation would fail.)
In practice, the disk format change is restricted to the inode btree,
which as far as I can tell is not used by grub. If all you're doing
today is parsing a directory, reading an inode number, and converting
that inode number to a disk location, then ignoring this feature
should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED
I did some brief testing of this patch by hacking up the regression
tests to completely fragment freespace on the test xfs filesystem, and
then write a large-ish number of inodes to consume any existing
contiguous 64-inode chunk. This way any files the grub tests add and
traverse would be in such a fragmented inode allocation. Tests passed,
but I'm not sure how to cleanly integrate that into the test harness.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Tested-by: Chris Murphy <lists@colorremedies.com>
2018-05-29 Oleg Solovyov <mcpain@altlinux.org>
grub-probe: Don't skip /dev/mapper/dm-* devices
This patch ensures that grub-probe will find the root device placed in
/dev/mapper/dm-[0-9]+-.* e.g. device named /dev/mapper/dm-0-luks will be
found and grub.cfg will be updated properly, enabling the system to boot.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-05-08 Michael Chang <mchang@suse.com>
bufio: Round up block size to power of 2
Rounding up the bufio->block_size to meet power of 2 to facilitate next_b
uf
calculation in grub_bufio_read().
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-23 Nicholas Vinson <nvinson234@gmail.com>
templates: Update grub script template files
Update grub-mkconfig.in and 10_linux.in to support grub-probe's new
partuuid target. Update grub.texi documentation. The following table
shows how GRUB_DISABLE_LINUX_UUID, GRUB_DISABLE_LINUX_PARTUUID, and
initramfs detection interact:
Initramfs GRUB_DISABLE_LINUX_PARTUUID GRUB_DISABLE_LINUX_UUID Linux Ro
ot
detected Set Set ID Metho
d
false false false part UUI
D
false false true part UUI
D
false true false dev name
false true true dev name
true false false fs UUID
true false true part UUI
D
true true false fs UUID
true true true dev name
Note: GRUB_DISABLE_LINUX_PARTUUID and GRUB_DISABLE_LINUX_UUID equate to
'false' when unset or set to any value other than 'true'.
GRUB_DISABLE_LINUX_PARTUUID defaults to 'true'.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-23 Nicholas Vinson <nvinson234@gmail.com>
grub-probe: Add PARTUUID detection support
Add PARTUUID detection support grub-probe for MBR and GPT partition schem
es.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-23 Nicholas Vinson <nvinson234@gmail.com>
disk: Update grub_gpt_partentry
Rename grub_gpt_part_type to grub_gpt_part_guid and update grub_gpt_parte
ntry
to use this type for both the partition type GUID string and the partitio
n GUID
string entries. This change ensures that the two GUID fields are handled
more
consistently and helps to simplify the changes needed to add Linux partit
ion
GUID support.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-23 Nicholas Vinson <nvinson234@gmail.com>
grub-probe: Centralize GUID prints
Define print_gpt_guid(), so there is a central function for printing
GUID strings. This change is a precursor for later patches which rely
on this logic.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-23 Olaf Hering <olaf@aepfle.de>
grub-install: Locale depends on nls
With --disable-nls no locales exist.
Avoid runtime error by moving code that copies locales into its own
function. Return early in case nls was disabled. That way the compiler
will throw away unreachable code, no need to put preprocessor
conditionals everywhere to avoid warnings about unused code.
Fix memleak by freeing srcf and dstf.
Convert tabs to spaces in moved code.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-23 Cao jin <caoj.fnst@cn.fujitsu.com>
diskboot: Trivial correction on stale comments
diskboot.img now is loaded at 0x8000 and is jumped to with 0:0x8000.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-10 Jaegeuk Kim <jaegeuk@kernel.org>
fs: Add F2FS support
"F2FS (Flash-Friendly File System) is flash-friendly file system which wa
s merged
into Linux kernel v3.8 in 2013.
The motive for F2FS was to build a file system that from the start, takes
into
account the characteristics of NAND flash memory-based storage devices (s
uch as
solid-state disks, eMMC, and SD cards).
F2FS was designed on a basis of a log-structured file system approach, wh
ich
remedies some known issues of the older log structured file systems, such
as
the snowball effect of wandering trees and high cleaning overhead. In add
ition,
since a NAND-based storage device shows different characteristics accordi
ng to
its internal geometry or flash memory management scheme (such as the Flas
h
Translation Layer or FTL), it supports various parameters not only for
configuring on-disk layout, but also for selecting allocation and cleanin
g
algorithm.", quote by https://en.wikipedia.org/wiki/F2FS.
The source codes for F2FS are available from:
http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs.git
http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
This patch has been integrated in OpenMandriva Lx 3.
https://www.openmandriva.org/
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-04 Michael Chang <mchang@suse.com>
Fix packed-not-aligned error on GCC 8
When building with GCC 8, there are several errors regarding packed-not-a
ligned.
./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_g
pt_partentry’ is less than 8 [-Werror=packed-not-aligned]
This patch fixes the build error by cleaning up the ambiguity of placing
aligned structure in a packed one. In "struct grub_btrfs_time" and "struc
t
grub_gpt_part_type", the aligned attribute seems to be superfluous, and a
lso
has to be packed, to ensure the structure is bit-to-bit mapped to the for
mat
laid on disk. I think we could blame to copy and paste error here for the
mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t,
as
the name suggests. :)
Tested-by: Michael Chang <mchang@suse.com>
Tested-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-04-04 mike.travis@hpe.com <mike.travis@hpe.com>
efi/uga: Fix PCIe LER when GRUB2 accesses non-enabled MMIO data from VGA
A GPU inserted into a PCIe I/O slot disappears during system startup.
The problem centers around GRUB and a specific VGA init function in
efi_uga.c. This causes an LER (Link Error Recorvery) because the MMIO
memory has not been enabled before attempting access.
The fix is to add the same coding used in other VGA drivers, specifically
to add a check to insure that it is indeed a VGA controller. And then
enable the MMIO address space with the specific bits.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-26 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: NULL pointer dereference in grub_machine_get_bootlocation()
Read from NULL pointer canon in function grub_machine_get_bootlocation().
Function grub_ieee1275_canonicalise_devname() may return NULL.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-14 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: split up grub_machine_get_bootlocation
Split up some of the functionality in grub_machine_get_bootlocation into
grub_ieee1275_get_boot_dev. This will allow for code reuse in a follow o
n
patch.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-14 C. Masloch <pushbx@38.de>
chainloader: patch in BPB's sectors_per_track and num_heads
These fields must reflect the ROM-BIOS's geometry for CHS-based
loaders to correctly load their next stage. Most loaders do not
query the ROM-BIOS (Int13.08), relying on the BPB fields to hold
the correct values already.
Tested with lDebug booted in qemu via grub2's
FreeDOS direct loading support, refer to
https://bitbucket.org/ecm/ldosboot + https://bitbucket.org/ecm/ldebug
(For this test, lDebug's iniload.asm must be assembled with
-D_QUERY_GEOMETRY=0 to leave the BPB values provided by grub.)
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-14 Matthew S. Turnbull <sparky@bluefang-logic.com>
grub-mkconfig/10_linux: Support multiple early initrd images
Add support for multiple, shared, early initrd images. These early
images will be loaded in the order declared, and all will be loaded
before the initrd image.
While many classes of data can be provided by early images, the
immediate use case would be for distributions to provide CPU
microcode to mitigate the Meltdown and Spectre vulnerabilities.
There are two environment variables provided for declaring the early
images.
* GRUB_EARLY_INITRD_LINUX_STOCK is for the distribution declare
images that are provided by the distribution or installed packages.
If undeclared, this will default to a set of common microcode image
names.
* GRUB_EARLY_INITRD_LINUX_CUSTOM is for user created images. User
images will be loaded after the stock images.
These separate configurations allow the distribution and user to
declare different image sets without clobbering each other.
This also makes a minor update to ensure that UUID partition labels
stay disabled when no initrd image is found, even if early images are
present.
This is a continuation of a previous patch published by Christian
Hesse in 2016:
http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00025.html
Down stream Gentoo bug:
https://bugs.gentoo.org/645088
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-07 Eric Snowberg <eric.snowberg@oracle.com>
mkimage: fix build regression in grub_mkimage_load_image
The grub_mkimage_load_image function (commit 7542af6, mkimage: refactor a
bunch
of section data into a struct.) introduces a build regression on SPARC:
cc1: warnings being treated as errors
In file included from util/grub-mkimage32.c:23:
util/grub-mkimagexx.c: In function 'grub_mkimage_load_image32':
util/grub-mkimagexx.c:1968: error: missing initializer
util/grub-mkimagexx.c:1968: error: (near initialization for 'smd.sectio
ns')
make[2]: *** [util/grub_mkimage-grub-mkimage32.o] Error 1
Initialize the entire section_metadata structure.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 dann frazier <dann.frazier@canonical.com>
Revert "Keep the native terminal active when enabling gfxterm"
This can cause an issue where GRUB is trying to display both a text and
graphical menu on the display at the same time, resulting in a flickering
effect when e.g. scrolling quickly through a menu (LP: #1752767).
Revert for now while we look for a better solution for the original issue
.
This reverts commit 52ef7b23f528ce844716661d586497a177e80d5b.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: #blocks64 disk node method
Return the 64bit number of blocks of storage associated with the device o
r
instance. Where a "block" is a unit of storage consisting of the number o
f
bytes returned by the package's "block-size" method. If the size cannot b
e
determined, or if the number of blocks exceeds the range return -1.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: #blocks disk node method
Return the number of blocks of storage associated with the device or
instance. Where a "block" is a unit of storage consisting of the number
of bytes returned by the package's "block-size" method. If the size canno
t
be determined, the #blocks method returns the maximum unsigned integer
(which, because of Open Firmware's assumption of two's complement arithme
tic,
is equivalent to the signed number -1). If the number of blocks exceeds
the range of an unsigned number, return 0 to alert the caller to try
the #blocks64 command.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: block-size deblocker support method
IEEE Std 1275-1994 Standard for Boot (Initialization Configuration)
Firmware: Core Requirements and Practices
3.8.3 deblocker support package
Any package that uses the "deblocker" support package must define
the following method, which the deblocker uses as a low-level
interface to the device
block-size ( -- block-len ) Return "granularity" for accesses to this
device.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Daniel Kiper <daniel.kiper@oracle.com>
ieee1275: no-data-command bus specific method
IEEE 1275-1994 Standard for Boot (Initialization Configuration)
Firmware: Core Requirements and Practices
E.3.2.2 Bus-specific methods for bus nodes
A package implementing the scsi-2 device type shall implement the
following bus-specific method:
no-data-command ( cmd-addr -- error? )
Executes a simple SCSI command, automatically retrying under
certain conditions. cmd-addr is the address of a 6-byte command buffer
containing an SCSI command that does not have a data transfer phase.
Executes the command, retrying indefinitely with the same retry criteria
as retry-command.
error? is nonzero if an error occurred, zero otherwise.
NOTE no-data-command is a convenience function. It provides
no capabilities that are not present in retry-command, but for
those commands that meet its restrictions, it is easier to use.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: set-address bus specific method
IEEE 1275-1994 Standard for Boot (Initialization Configuration)
Firmware: Core Requirements and Practices
E.3.2.2 Bus-specific methods for bus nodes
A package implementing the scsi-2 device type shall implement the
following bus-specific method:
set-address ( unit# target# -- )
Sets the SCSI target number (0x0..0xf) and unit number (0..7) to which
subsequent commands apply.
This function is for devices with #address-cells == 2
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: encode-unit command for 4 addr cell devs
Convert physical address to text unit-string.
Convert phys.lo ... phys-high, the numerical representation, to unit-stri
ng,
the text string representation of a physical address within the address
space defined by this device node. The number of cells in the list
phys.lo ... phys.hi is determined by the value of the #address-cells prop
erty
of this node.
This function is for devices with #address-cells == 4
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: decode-unit command for 4 addr cell devs
decode-unit ( addr len -- phys.lo ... phys.hi )
Convert text unit-string to physical address.
Convert unit-string, the text string representation, to phys.lo ... phys.
hi,
the numerical representation of a physical address within the address spa
ce
defined by this device node. The number of cells in the list
phys.lo ... phys.hi is determined by the value of the #address-cells
property of this node.
This function is for devices with #address-cells == 4
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: Limit nvme of_path_of_nvme to just SPARC
Limit NVMe of_path_of_nvme to just SPARC hardware for now. It has been
found that non-Open Firmware hardware platforms can some how access
this function.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
ieee1275: Fix crash in of_path_of_nvme when of_path is empty
The of_path_of_nvme function (commit 2391d57, ieee1275: add nvme
support within ofpath) introduced a functional regression:
On systems which are not based on Open Firmware but have at
least one NVME device, find_obppath will return NULL and thus
trying to append the disk name to of_path will result in a
crash.
The proper behavior of of_path_of_nvme is, however, to just
return NULL in such cases, like other users of find_obppath,
such as of_path_of_scsi.
Reviewed-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Peter Jones <pjones@redhat.com>
.mod files: Strip annobin annotations and .eh_frame, and their relocation
s
This way debuginfo built from the .module will still include this
information, but the final result won't have the data we don't actually
need in the modules, either on-disk, loaded at runtime, or in prebuilt
images.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Peter Jones <pjones@redhat.com>
mkimage: avoid copying relocations for sections that won't be copied.
Some versions of gcc include a plugin called "annobin", and in some
build systems this is enabled by default. This plugin creates special
ELF note sections to track which ABI-breaking features are used by a
binary, as well as a series of relocations to annotate where.
If grub is compiled with this feature, then when grub-mkimage translates
the binary to another file format which does not strongly associate
relocation data with sections (i.e. when platform is *-efi), these
relocations appear to be against the .text section rather than the
original note section. When the binary is loaded by the PE runtime
loader, hilarity ensues.
This issue is not necessarily limited to the annobin, but could arise
any time there are relocations in sections that are not represented in
grub-mkimage's output.
This patch seeks to avoid this issue by only including relocations that
refer to sections which will be included in the final binary.
As an aside, this should also obviate the need to avoid -funwind-tables,
-fasynchronous-unwind-tables, and any sections similar to .eh_frame in
the future. I've tested it on x86-64-efi with the following gcc command
line options (as recorded by -grecord-gcc-flags), but I still need to
test the result on some other platforms that have been problematic in
the past (especially ARM Aarch64) before I feel comfortable making
changes to the configure.ac bits:
GNU C11 7.2.1 20180116 (Red Hat 7.2.1-7) -mno-mmx -mno-sse -mno-sse2 -mno
-sse3 -mno-3dnow -msoft-float -mno-stack-arg-probe -mcmodel=large -mno-red-zone
-m64 -mtune=generic -march=x86-64 -g3 -Os -freg-struct-return -fno-stack-protect
or -ffreestanding -funwind-tables -fasynchronous-unwind-tables -fno-strict-alias
ing -fstack-clash-protection -fno-ident -fplugin=annobin
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Peter Jones <pjones@redhat.com>
mkimage: refactor a bunch of section data into a struct.
This basically moves a bunch of the section information we pass around a
lot into a struct, and passes a pointer to a single one of those
instead.
This shouldn't change the binary file output or the "grub-mkimage -v"
output in any way.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Peter Jones <pjones@redhat.com>
mkimage: make locate_sections() set up vaddresses as well.
This puts both kinds of address initialization at the same place, and als
o lets
us iterate through the section list one time fewer.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Peter Jones <pjones@redhat.com>
mkimage: rename a couple of things to be less confusing later.
This renames some things:
- the "strtab" and "strtab_section" in relocate_symbols are changed to "s
ymtab"
instead, so as to be less confusing when "strtab" is moved to a struct
in a
later patch.
- The places where we pass section_vaddresses to functions are changed to
also
be called section_vaddresses"inside those functions, so I get less conf
used
when I put addresses and vaddresses in a struct in a later patch.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Peter Jones <pjones@redhat.com>
mkimage: make it easier to run syntax checkers on grub-mkimagexx.c
This makes it so you can treat grub-mkimagexx.c as a file you can build
directly, so syntax checkers like vim's "syntastic" plugin, which uses
"gcc -x c -fsyntax-only" to build it, will work.
One still has to do whatever setup is required to make it pick the right
include dirs, which -W options we use, etc., but this makes it so you
can do the checking on the file you're editing, rather than on a
different file.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-03-05 Peter Jones <pjones@redhat.com>
aout.h: Fix missing include.
grub_aout_load() has a grub_file_t parameter, and depending on what order
includes land in, it's sometimes not defined. This patch explicitly adds
file.h to aout.h so that it will always be defined.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-26 Joakim Bech <joakim.bech@linaro.org>
ieee1275: fix build regression in of_path_of_nvme
The of_path_of_nvme function (commit 2391d57, ieee1275: add nvme
support within ofpath) introduced a build regression:
grub-core/osdep/linux/ofpath.c:365:21: error: comparison between poin
ter
and zero character constant [-Werror=pointer-compare]
if ((digit_string != '\0') && (*part_end == 'p'))
Update digit_string to compare against the char instead of the pointer.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
arm: make linux.h safe to include for non-native builds
<grub/machine/loader.h> (for machine arm/efi) and
<grub/machine/kernel.h> (for machine arm/coreboot) will not always
resolve (and will likely not be valid to) if pulled in when building
non-native commands, such as host tools or the "file" command.
So explicitly include them with their expanded pathnames.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
arm: switch linux loader to linux_arm_kernel_header struct
Use kernel header struct and magic definition to align (and coexist) with
i386/arm64 ports.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
arm64: align linux kernel magic macro naming with i386
Change GRUB_ARM64_LINUX_MAGIC to GRUB_LINUX_ARM64_MAGIC_SIGNATURE.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
arm64: align linux kernel header struct naming with i386
Rename struct grub_arm64_linux_kernel_header -> linux_arm64_kernel_header
.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
i386: make struct linux_kernel_header architecture specific
struct linux_kernel_header -> struct linux_i386_kernel_header
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
make GRUB_LINUX_MAGIC_SIGNATURE architecture-specific
Rename GRUB_LINUX_MAGIC_SIGNATURE GRUB_LINUX_I386_MAGIC_SIGNATURE,
to be usable in code that supports more than one image type.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
Make arch-specific linux.h include guards architecture unique
Replace uses of GRUB_LINUX_MACHINE_HEADER and GRUB_LINUX_CPU_HEADER
with GRUB_<arch>_LINUX_HEADER include guards to prevent issues when
including more than one of them.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Leif Lindholm <leif.lindholm@linaro.org>
arm64/efi: move EFI_PAGE definitions to efi/memory.h
The EFI page definitions and macros are generic and should not be confine
d
to arm64 headers - so move to efi/memory.h.
Also add EFI_PAGE_SIZE macro.
Update loader sources to reflect new header location.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Colin Watson <cjwatson@ubuntu.com>
libgcrypt: Import replacement CRC operations
The CRC implementation imported from libgcrypt 1.5.3 is arguably
non-free, due to being encumbered by the restrictive Internet Society
licence on RFCs (see e.g. https://wiki.debian.org/NonFreeIETFDocuments).
Fortunately, libgcrypt has since replaced it with a version that is both
reportedly better-optimised and doesn't suffer from this encumbrance.
The ideal solution would be to update to a new version of libgcrypt, and
I spent some time trying to do that. However, util/import_gcry.py
requires complex modifications to cope with the new version, and I
stalled part-way through; furthermore, GRUB's libgcrypt tree already
contains some backports of upstream changes. Rather than allowing the
perfect to be the enemy of the good, I think it's best to backport this
single change to at least sort out the licensing situation. Doing so
won't make things any harder for a future wholesale upgrade.
This commit is mostly a straightforward backport of
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0
6e122baa3321483a47bbf82fd2a4540becfa0c9,
but I also imported bufhelp.h from libgcrypt 1.7.0 (newer versions
required further changes elsewhere).
I've tested that "hashsum -h crc32" still produces correct output for a
variety of files on both i386-pc and x86_64-emu targets.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: add nvme support within ofpath
Add NVMe support within ofpath.
The Open Firmware text representation for a NVMe device contains the
Namespace ID. An invalid namespace ID is one whose value is zero or whose
value is greater than the value reported by the Number of Namespaces (NN)
field in the Identify Controller data structure. At the moment only a
single Namespace is supported, therefore the value is currently hard code
d
to one.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 Daniel Kiper <daniel.kiper@oracle.com>
chainloader: Fix wrong break condition (must be AND not, OR)
The definition of bpb's num_total_sectors_16 and num_total_sectors_32
is that either the 16-bit field is non-zero and is used (in which case
eg mkfs.fat sets the 32-bit field to zero), or it is zero and the
32-bit field is used. Therefore, a BPB is invalid only if *both*
fields are zero; having one field as zero and the other as non-zero is
the case to be expected. (Indeed, according to Microsoft's specification
one of the fields *must* be zero, and the other non-zero.)
This affects all users of grub_chainloader_patch_bpb which are in
chainloader.c, freedos.c, and ntldr.c
Some descriptions of the semantics of these two fields:
https://www.win.tue.nl/~aeb/linux/fs/fat/fat-1.html
The old 2-byte fields "total number of sectors" and "number of
sectors per FAT" are now zero; this information is now found in
the new 4-byte fields.
(Here given in the FAT32 EBPB section but the total sectors 16/32 bit
fields semantic is true of FAT12 and FAT16 too.)
https://wiki.osdev.org/FAT#BPB_.28BIOS_Parameter_Block.29
19 | 2 | The total sectors in the logical volume. If this value is 0,
it means there are more than 65535 sectors in the volume, and the actua
l
count is stored in "Large Sectors (bytes 32-35).
32 | 4 | Large amount of sector on media. This field is set if there
are more than 65535 sectors in the volume.
(Doesn't specify what the "large" field is set to when unused, but as
mentioned mkfs.fat sets it to zero then.)
https://technet.microsoft.com/en-us/library/cc976796.aspx
0x13 | WORD | 0x0000 |
Small Sectors . The number of sectors on the volume represented in 16
bits (< 65,536). For volumes larger than 65,536 sectors, this field
has a value of zero and the Large Sectors field is used instead.
0x20 | DWORD | 0x01F03E00 |
Large Sectors . If the value of the Small Sectors field is zero, this
field contains the total number of sectors in the FAT16 volume. If the
value of the Small Sectors field is not zero, the value of this field
is zero.
BPB_TotSec16 | 19 | 2 |
This field is the old 16-bit total count of sectors on the volume.
This count includes the count of all sectors in all four regions of the
volume. This field can be 0; if it is 0, then BPB_TotSec32 must be
non-zero. For FAT32 volumes, this field must be 0. For FAT12 and
FAT16 volumes, this field contains the sector count, and
BPB_TotSec32 is 0 if the total sector count “fits” (is less than
0x10000).
BPB_TotSec32 | 32 | 4 |
This field is the new 32-bit total count of sectors on the volume.
This count includes the count of all sectors in all four regions of the
volume. This field can be 0; if it is 0, then BPB_TotSec16 must be
non-zero. For FAT32 volumes, this field must be non-zero. For
FAT12/FAT16 volumes, this field contains the sector count if
BPB_TotSec16 is 0 (count is greater than or equal to 0x10000).
(This specifies that an unused BPB_TotSec32 field is set to zero.)
By the way fix offsets in include/grub/fat.h.
Tested with lDebug booted in qemu via grub2's
FreeDOS direct loading support, refer to
https://bitbucket.org/ecm/ldosboot + https://bitbucket.org/ecm/ldebug
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-23 H.J. Lu <hjl.tools@gmail.com>
x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788
ad53521c45469a1bdae84ad4a
x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as
R_X86_64_PC32.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-14 Steve McIntyre <steve@einval.com>
Make grub-install check for errors from efibootmgr
Code is currently ignoring errors from efibootmgr, giving users
clearly bogus output like:
Setting up grub-efi-amd64 (2.02~beta3-4) ...
Installing for x86_64-efi platform.
Could not delete variable: No space left on device
Could not prepare Boot variable: No space left on device
Installation finished. No error reported.
and then potentially unbootable systems. If efibootmgr fails, grub-instal
l
should know that and report it!
We've been using similar patch in Debian now for some time, with no ill e
ffects.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-14 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: fix OF path names for sun4v systems
Fix the Open Firmware (OF) path property for sun4v SPARC systems.
These platforms do not have a /sas/ within their path. Over time
different OF addressing schemes have been supported. There
is no generic addressing scheme that works across every HBA.
It looks that this functionality will not work if you try to cross-instal
l
SPARC GRUB2 binary using e.g. x86 grub-install. By default it should work
.
However, we will also have other issues here, like lack of access to OF
firmware/paths, which make such configs unusable anyway. So, let's leave
this patch as is for time being. If somebody cares then he/she should fix
the issue(s) at some point.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-02-14 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: Add blocklist GPT support for SPARC
Add block-list GPT support for SPARC. The OBP "load" and "boot" methods
are partition aware and neither command can see the partition table. Also
neither command can address the entire physical disk. When the install
happens, grub generates the block-list entries based on the beginning of
the
physical disk, not the beginning of the partition. This patch fixes the
block-list entries so they match what OBP expects during boot for a GPT d
isk.
T5 and above now supports GPT as well as VTOC.
This patch has been tested on T5-2 and newer SPARC systems.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-01-29 Stefan Fritsch <fritsch@genua.de>
ahci: Improve error handling
Check the error bits in the interrupt status register. According to the
AHCI 1.2 spec, "Interrupt sources that are disabled (‘0’) are still
reflected in the status registers.", so this should work even though
grub uses polling
This fixes the following problem on a Fujitsu E744 laptop:
Sometimes there is a very long delay (up to several minutes) when
booting from hard disk. It seems accessing the DVD drive (which has no
disk inserted) sometimes fails with some errors, which leads to each
access being stalled until the 20s timeout triggers. This seems to
happen when grub is trying to read filesystem/partition data.
The problem is that the command_issue bit that is checked in the loop is
only reset if the "HBA receives a FIS which clears the BSY, DRQ, and ERR
bits for the command", but the ERR bit is never cleared. Therefore
command_issue is never reset and grub waits for the timeout.
The relevant bit in our case is the Task File Error Status (TFES), which
is equivalent to the ERR bit 0 in tfd. But this patch also checks
the other error bits except for the "Interface non-fatal error status"
bit.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2018-01-29 dann frazier <dann.frazier@canonical.com>
Keep the native terminal active when enabling gfxterm
grub-mkconfig will set GRUB_TERMINAL_OUTPUT to "gfxterm" unless the user
has overridden it. On EFI systems, this will stop output from going to th
e
default "console" terminal. When the EFI fw console is configured to outp
ut to
both serial and video, this will cause GRUB to only display on video - wh
ile
continuing to accept input from both video and serial.
Instead of switching from "console" to "gfxterm", let's output to both.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-12-06 Julien Grall <julien.grall@linaro.org>
arm64/xen: Add missing #address-cells and #size-cells properties
The properties #address-cells and #size-cells are used to know the
number of cells for ranges provided by "regs". If they don't exist, the
value are resp. 2 and 1.
Currently, when multiboot nodes are created it is assumed that #address-c
ells
and #size-cells are exactly 2. However, they are never set by GRUB and
will result to later failure when the device-tree is generated by GRUB
or contain different values.
To prevent this failure, create the both properties in the chosen nodes.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-12-06 Jordan Glover <Golden_Miller83@protonmail.ch>
grub-mkconfig: Fix detecting .sig files as system images
grub-mkconfig detects detached RSA signatures for kernel images used for
signature checking as valid images and adds them to grub.cfg as separate
menu entries. This patch adds .sig extension to common blacklist.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-12-06 Eric Snowberg <eric.snowberg@oracle.com>
ieee1275: Fix segfault in grub-ofpathname
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-11-28 Eric Snowberg <eric.snowberg@oracle.com>
grub-install: Fix memory leak
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-11-24 Eric Snowberg <eric.snowberg@oracle.com>
ls: prevent double open
Prevent a double open. This can cause problems with some ieee1275
devices, causing the system to hang. The double open can occur
as follows:
grub_ls_list_files (char *dirname, int longlist, int all, int human)
dev = grub_device_open (device_name);
dev remains open while:
grub_normal_print_device_info (device_name);
dev = grub_device_open (name);
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-10-06 David E. Box <david.e.box@linux.intel.com>
tsc: Change default tsc calibration method to pmtimer on EFI systems
On efi systems, make pmtimer based tsc calibration the default over the
pit. This prevents Grub from hanging on Intel SoC systems that power gate
the pit.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-09-07 Alexander Graf <agraf@suse.de>
efi: Free malloc regions on exit
When we exit grub, we don't free all the memory that we allocated earlier
for our heap region. This can cause problems with setups where you try
to descend the boot order using "exit" entries, such as PXE -> HD boot
scenarios.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-09-07 Alexander Graf <agraf@suse.de>
efi: Move grub_reboot() into kernel
The reboot function calls machine_fini() and then reboots the system.
Currently it lives in lib/ which means it gets compiled into the
reboot module which lives on the heap.
In a following patch, I want to free the heap on machine_fini()
though, so we would free the memory that the code is running in. That
obviously breaks with smarter UEFI implementations.
So this patch moves it into the core. That way we ensure that all
code running after machine_fini() in the UEFI case is running from
memory that got allocated (and gets deallocated) by the UEFI core.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-09-07 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Use grub-file to figure out whether multiboot2 should be used for Xen.gz
The multiboot2 is much more preferable than multiboot. Especiall
if booting under EFI where multiboot does not have the functionality
to pass ImageHandler.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-09-07 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
Commit d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe introduced
the support for this, but it does not work under x86 (as it stops
20_linux_xen from running).
The 20_linux_xen is run under a shell and any exits from within it:
(For example on x86):
+ /usr/bin/grub2-file --is-arm64-efi /boot/xen-4.9.0.gz
[root@tst063 grub]# echo $?
1
will result in 20_linux_xen exiting without continuing
and also causing grub2-mkconfig to stop processing.
As in:
[root@tst063 grub]# ./grub-mkconfig | tail
Generating grub configuration file ...
Found linux image: /boot/vmlinuz-4.13.0-0.rc5.git1.1.fc27.x86_64
Found initrd image: /boot/initramfs-4.13.0-0.rc5.git1.1.fc27.x86_64.img
Found linux image: /boot/vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10c
c2
Found initrd image: /boot/initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d
10cc2.img
echo 'Loading Linux 0-rescue-ec082ee24aea41b9b16aca52a
6d10cc2 ...'
linux /vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc
2 root=/dev/mapper/fedora_tst063-root ro single
echo 'Loading initial ramdisk ...'
initrd /initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10
cc2.img
}
}
### END /usr/local/etc/grub.d/10_linux ###
### BEGIN /usr/local/etc/grub.d/20_linux_xen ###
root@tst063 grub]#
And no more.
This patch wraps the invocation of grub-file to be a in subshell
and to process the return value in a conditional. That fixes
the issue.
RH-BZ 1486002: grub2-mkconfig does not work if xen.gz is installed.
CC: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-09-07 Vladimir Serbinenko <phcoder@gmail.com>
Fix compilation for x86_64-efi.
2017-09-05 Vladimir Serbinenko <phcoder@gmail.com>
Add a file missing in multiboot2 commit.
2017-08-30 Vladimir Serbinenko <phcoder@google.com>
gzio: fix unaligned access
grub-fs-tester: Fix bashism
2017-08-30 Vladimir Serbinenko <phcoder@gmail.com>
Regenerate checksum.h with newer unifont.
Old link is broken. New unifont is
http://ftp.de.debian.org/debian/pool/main/u/unifont/xfonts-unifont_9.0.06
-2_all.deb
printf_unit_test: Disable Wformat-truncation on GCC >= 7
We intentionally pass NULL as argument to format, hence disable the warni
ng.
qemu, coreboot, multiboot: Change linking address to 0x9000.
It's common for distros to use a defective ld which links at 0x9000. Inst
ead
of fighting it, just move link target to 0x9000.
2017-08-30 Stefan Fritsch <sf@sfritsch.de>
Implement checksum verification for gunzip
This implements the crc32 check for the gzip format. Support for zlib's
adler checksum is not included, yet.
2017-08-30 Vladimir Serbinenko <phcoder@gmail.com>
xfs: Don't attempt to iterate over empty directory.
Reported by: Tuomas Tynkkynen
2017-08-30 Patrick Steinhardt <ps@pks.im>
unix exec: avoid atexit handlers when child exits
The `grub_util_exec_redirect_all` helper function can be used to
spawn an executable and redirect its output to some files. After calling
`fork()`, the parent will wait for the child to terminate with
`waitpid()` while the child prepares its file descriptors, environment
and finally calls `execvp()`. If something in the children's setup
fails, it will stop by calling `exit(127)`.
Calling `exit()` will cause any function registered via `atexit()` to be
executed, which is usually the wrong thing to do in a child. And
actually, one can easily observe faulty behaviour on musl-based systems
without modprobe(8) installed: executing `grub-install --help` will call
`grub_util_exec_redirect_all` with "modprobe", which obviously fails if
modprobe(8) is not installed. Due to the child now exiting and invoking
the `atexit()` handlers, it will clean up some data structures of the
parent and cause it to be deadlocked in the `waitpid()` syscall.
The issue can easily be fixed by calling `_exit(127)` instead, which is
especially designed to be called when the atexit-handlers should not be
executed.
2017-08-30 Vladimir Serbinenko <phcoder@gmail.com>
arc: Do not create spurious variable grub_arc_memory_type_t.
2017-08-14 Xuan Guo <nbdd0121>
Set have_exec to y on cygwin so we have grub_mkrescue.
2017-08-14 Vladimir Serbinenko <phcoder@gmail.com>
enforcing fixup
multiboot fixup
linux fixup
yylex: Explicilty cast fprintf to void.
It's needed to avoid warning on recent GCC.
genmoddep: Check that no modules provide the same symbol.
The semantics of 2 modules providing the same symbol are undefined. So
ensure that it doesn't happen.
Fix symbols appearing in several modules in linux*.
If same symbol is provided by 2 modules its semantics are undefined.
Avoid this by depending rather than double-including files.
2017-08-14 Vladimir Serbinenko <phcoder@gmail.com>
multiboot: disentangle multiboot and multiboot2.
Previously we had multiboot and multiboot2 declaring the same symbols.
This can potentially lead to aliasing and strange behaviours when e.g.
module instead of module2 is used with multiboot2.
Bug: #51137
2017-08-14 Vladimir Serbinenko <phcoder@gmail.com>
hdparm: Depend on hexdump rather than having a second copy of hexdump.
grub.texi: Fix typo
Reported by: Ori Avtalion <saltyhorse>
2017-08-07 Pete Batard <pete@akeo.ie>
io: add a GRUB_GZ prefix to gzio specific defines
* This is done to avoid a conflict with a PACKED define in the EDK2
core: use GRUB_TERM_ definitions when handling term characters
* Also use hex value for GRUB_TERM_ESC as '\e' is not in the C standard a
nd is not understood by some compilers
2017-08-07 Leif Lindholm <leif.lindholm@linaro.org>
efi: change heap allocation type to GRUB_EFI_LOADER_CODE
With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may
not return regions with execute ability. Since modules are loaded onto
the heap, change the heap allocation type to GRUB_EFI_LOADER_CODE in
order to permit execution on systems with this feature enabled.
Closes: 50420
2017-08-07 Leif Lindholm <leif.lindholm@linaro.org>
arm64 linux loader: improve type portability
In preparation for turning this into a common loader for 32-bit and 64-bi
t
platforms, ensure the code will compile cleanly for either.
2017-08-07 Leif Lindholm <leif.lindholm@linaro.org>
efi: Add GRUB_PE32_MAGIC definition
Add a generic GRUB_PE32_MAGIC definition for the PE 'MZ' tag and delete
the existing one in arm64/linux.h.
Update arm64 Linux loader to use this new definition.
2017-08-07 Leif Lindholm <leif.lindholm@linaro.org>
efi: move fdt helper library
There is nothing ARM64 (or even ARM) specific about the efi fdt helper
library, which is used for locating or overriding a firmware-provided
devicetree in a UEFI system - so move it to loader/efi for reuse.
Move the fdtload.h include file to grub/efi and update path to
efi/fdtload.h in source code referring to it.
2017-08-07 Vladimir Serbinenko <phcoder@gmail.com>
Remove grub_efi_allocate_pages.
grub_efi_allocate_pages Essentially does 2 unrelated things:
* Allocate at fixed address.
* Allocate at any address.
To switch between 2 different functions it uses address == 0 as magic
value which is wrong as 0 is a perfectly valid fixed adress to allocate a
t.
2017-08-07 Leif Lindholm <leif.lindholm@linaro.org>
efi: refactor grub_efi_allocate_pages
Expose a new function, grub_efi_allocate_pages_real(), making it possible
to specify allocation type and memory type as supported by the UEFI
AllocatePages boot service.
Make grub_efi_allocate_pages() a consumer of the new function,
maintaining its old functionality.
Also delete some left-around #if 1/#else blocks in the affected
functions.
2017-08-07 Vladimir Serbinenko <phcoder@gmail.com>
Fail if xorriso failed.
If xorriso failed most likely we didn't generate a meaningful image.
mkrescue: Check xorriso presence before doing anything else.
mkrescue can't do anything useful without xorriso, so abort early if it's
not available.
2017-08-07 Pali Rohár <pali.rohar@gmail.com>
* grub-core/fs/udf.c: Add support for UUID
Use same algorithm as in libblkid from util-linux v2.30.
1. Take first 16 bytes from UTF-8 encoded string of VolumeSetIdentifier
2. If all bytes are hexadecimal digits, convert to lowercase and use as U
UID
3. If first 8 bytes are not all hexadecimal digits, convert those 8 bytes
to their hexadecimal representation, resulting in 16 bytes for UUID
4. Otherwise, compose UUID from two parts:
1. part: converted first 8 bytes (which are hexadecimal digits) to low
ercase
2. part: encoded following 4 bytes to their hexadecimal representation
(16 bytes)
So UUID would always have 16 hexadecimal digits in lowercase variant.
According to UDF specification, first 16 Unicode characters of
VolumeSetIdentifier should be unique value and first 8 should be
hexadecimal characters.
In most cases all 16 characters are hexadecimal, but e.g. MS Windows
format.exe set only first 8 as hexadecimal and remaining as fixed
(non-unique) which violates specification.
2017-08-07 Pali Rohár <pali.rohar@gmail.com>
udf: Fix reading label, lvd.ident is dstring
UDF dstring has stored length in the last byte of buffer. Therefore last
byte is not part of recorded characters. And empty string in dstring is
encoded as empty buffer, including first byte (compression id).
2017-08-07 Pete Batard <pete@akeo.ie>
zfs: remove size_t typedef and use grub_size_t instead
* Prevents some toolchains from issuing a warning on size_t redef.
2017-08-03 Rob Clark <rclark@redhat.com>
Fix a segfault in lsefi
when protocols_per_handle returns error, we can't use the pointers we
passed to it, and that includes trusting num_protocols.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-07-10 Vladimir Serbinenko <phcoder@gmail.com>
fdt: silence clang warning.
2017-07-09 Vladimir Serbinenko <phcoder@gmail.com>
arm-efi: Fix compilation
2017-07-09 AppChecker <appchecker>
crypto: Fix use after free.
Reported by: AppChecker
Transformed to patch by: Satish Govindarajan
2017-07-09 Vladimir Serbinenko <phcoder@gmail.com>
ehci: Fix compilation on i386
2017-07-09 phcoder <phcoder@sid.debian.laptop.phnet>
cache: Fix compilation for ppc, sparc and arm64
ehci: Fix compilation for amd64
2017-06-29 Eric Biggers <ebiggers@google.com>
Allow GRUB to mount ext2/3/4 filesystems that have the encryption feature
.
On such a filesystem, inodes may have EXT4_ENCRYPT_FLAG set.
For a regular file, this means its contents are encrypted; for a
directory, this means the filenames in its directory entries are
encrypted; and for a symlink, this means its target is encrypted. Since
GRUB cannot decrypt encrypted contents or filenames, just issue an error
if it would need to do so. This is sufficient to allow unencrypted boot
files to co-exist with encrypted files elsewhere on the filesystem.
(Note that encrypted regular files and symlinks will not normally be
encountered outside an encrypted directory; however, it's possible via
hard links, so they still need to be handled.)
Tested by booting from an ext4 /boot partition on which I had run
'tune2fs -O encrypt'. I also verified that the expected error messages
are printed when trying to access encrypted directories, files, and
symlinks from the GRUB command line. Also ran 'sudo ./grub-fs-tester
ext4_encrypt'; note that this requires e2fsprogs v1.43+ and Linux v4.1+.
2017-05-29 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: Don't use devspec to determine the OBP path
Don't use devspec to determine the OBP path on SPARC hardware. Within al
l
versions of Linux on SPARC, the devspec returns one of three values:
"none", "vnet-port", or "vdisk". Unlike on PPC, none of these values
are useful in determining the OBP path.
Before this patch grub-ofpathname always returned the wrong value
for a virtual disk. For example:
% grub-ofpathname /dev/vdiskc2
vdisk/disk@2:b
After this patch it now returns the correct value:
% grub-ofpathname /dev/vdiskc2
/virtual-devices@100/channel-devices@200/disk@2:b
Orabug: 24459765
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-05-18 Fu Wei <fu.wei@linaro.org>
arm64: Update the introduction of Xen boot commands in docs/grub.texi
delete: xen_linux, xen_initrd, xen_xsm
add: xen_module
This update bases on
commit 0edd750e50698854068358ea53528100a9192902
Author: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri Jan 22 10:18:47 2016 +0100
xen_boot: Remove obsolete module type distinctions.
Also bases on the module loading mechanism of Xen code:
488c2a8 docs/arm64: clarify the documention for loading XSM support
67831c4 docs/arm64: update the documentation for loading XSM support
ca32012 xen/arm64: check XSM Magic from the second unknown module.
Reviewed-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-05-18 Fu Wei <fu.wei@linaro.org>
util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
This patch adds the support of xen_boot command for aarch64:
xen_hypervisor
xen_module
These two commands are only for aarch64, since it has its own protocol an
d
commands to boot xen hypervisor and Dom0, but not multiboot.
For other architectures, they are still using multiboot and module
commands.
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-05-18 Fu Wei <fu.wei@linaro.org>
arm64: Add "--nounzip" option support in xen_module command
This patch adds "--nounzip" option support in order to
be compatible with the module command of multiboot on other architecture,
by this way we can simplify grub-mkconfig support code.
This patch also allow us to use zip compressed module(like Linux kernel
for Dom0).
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-05-18 Julien Grall <julien.grall@linaro.org>
arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
Xen is currently crashing because of malformed compatible property for
the boot module. This is because the property string is not
null-terminated as requested by the ePAR spec.
Tested-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-05-18 Eric Snowberg <eric.snowberg@oracle.com>
sparc64: Close cdboot ihandle
The ihandle is left open with a cd-core image. This will cause a delay
booting grub from a virtual cdrom in a LDOM. It will also cause problems
as Linux boots, since it expects the ihandle to be closed during init.
Orabug: 25911275
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-05-09 Vladimir Serbinenko <phcoder@gmail.com>
at_keyboard: Fix falco chromebook case.
EC is slow, so we need few delays for it to toggle the bits correctly.
Command to enable clock and keyboard were not sent.
2017-05-09 Julius Werner <jwerner@chromium.org>
coreboot: Changed cbmemc to support updated console format from coreboot.
2017-05-09 Vladimir Serbinenko <phcoder@gmail.com>
Missing parts of previous commit
arm_coreboot: Add Chromebook keyboard driver.
rk3288_spi: Add SPI driver
fdtbus: Add ability to send/receive messages on parent busses.
Fix bug on FDT nodes with compatible property
2017-05-08 Vladimir Serbinenko <phcoder@gmail.com>
arm_coreboot: Support EHCI.
ehci: Split core code from PCI part.
On ARM often EHCI is present without PCI and just declared in device
tree. So splitcore from PCI part.
arm_coreboot: Support DMA.
This is needed to support USB and some other busses.
arm_coreboot: Support loading linux images.
arm_coreboot: Support grub-mkstandalone.
arm_coreboot: Support keyboard for vexpress.
at_keyboard: Split protocol from controller code.
On vexpress controller is different but protocol is the same, so reuse th
e
code.
arm-coreboot: Export FDT routines.
We need to use them from modules as well.
arm-coreboot: Support for vexpress timer.
Add support for device-tree-based drivers.
arm-coreboot: Start new port.
Rename uboot/datetime to dummy/datetime.
It's just a stub and is not UBoot-specific.
Rename uboot/halt.c to dummy/halt.c.
It's not U-Boot specific and it's a stub.
coreboot: Split parts that are platform-independent.
We currently assume that coreboot is always i386, it's no longer the case
,
so split i386-coreboot parts from generic coreboot code.
Refactor arm-uboot code to make it genereic.
arm-coreboot startup code can be very similar to arm-uboot but current co
de has
U-Boot specific references. So split U-Boot part from generic part.
mkimage: Pass layout to mkimage_generate_elfXX rather than some fields.
This allows easier extension of this function without having too long of
arguments list.
2017-05-03 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Add Virtual LAN support.
This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allo
ws
multiple VLANs in a bridged network to share the same physical network li
nk
but maintain isolation:
http://en.wikipedia.org/wiki/IEEE_802.1Q
* grub-core/net/ethernet.c: Add check, get, and set vlan tag id.
* grub-core/net/drivers/ieee1275/ofnet.c: Get vlan tag id from bootargs.
* grub-core/net/arp.c: Add check.
* grub-core/net/ip.c: Likewise.
* include/grub/net/arp.h: Add vlantag attribute.
* include/grub/net/ip.h: Likewise.
2017-05-03 Vladimir Serbinenko <phcoder@gmail.com>
strtoull: Fix behaviour on chars between '9' and 'a'.
Reported by: Aaron Miller <aaronmiller@fb.com>
Add strtoull test.
Fix shebang for termux.
Termux doesn't have a /bin/sh. So we needto use $SHELL.
Keep /bin/sh as much as possible.
Add termux path to dict.
po: Use @SHELL@ rather than /bin/sh.
/bin/sh might not exist.
Use $(SHELL) rather than /bin/sh.
/bin/sh doesn't exist under termux.
Support lseek64.
Android doesn't have 64-bit off_t, so use off64_t instead.
Don't retrieve fstime when it's not useful.
support busybox date.
Busybox date doesn't understand weekdays in -d input,
so strip them beforehand.
fs-tester: make sh-compatible
Remove bashisms from tests.
Those tests don't actually need bash. Just use common shebang.
Bump version to 2.03
2017-04-25 Vladimir Serbinenko <phcoder@gmail.com> 2017-04-25 Vladimir Serbinenko <phcoder@gmail.com>
Increase version to 2.02. Increase version to 2.02.
2017-04-12 Vladimir Serbinenko <phcoder@gmail.com> 2017-04-12 Vladimir Serbinenko <phcoder@gmail.com>
Fix remaining cases of gcc 7 fallthrough warning. Fix remaining cases of gcc 7 fallthrough warning.
They are all intended, so just add the relevant comment. They are all intended, so just add the relevant comment.
2017-04-04 Andrei Borzenkov <arvidjaar@gmail.com> 2017-04-04 Andrei Borzenkov <arvidjaar@gmail.com>
 End of changes. 1 change blocks. 
0 lines changed or deleted 4344 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)