grub.git
6 years agosparc64: Add blocklist GPT support for SPARC
Eric Snowberg [Fri, 12 May 2017 01:25:24 +0000 (18:25 -0700)]
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 disk.

T5 and above now supports GPT as well as VTOC.

This patch has been tested on T5-2 and newer SPARC systems.

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoahci: Improve error handling
Stefan Fritsch [Fri, 19 Jan 2018 13:13:29 +0000 (14:13 +0100)]
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.

Signed-off-by: Stefan Fritsch <fritsch@genua.de>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoKeep the native terminal active when enabling gfxterm
dann frazier [Thu, 18 Jan 2018 18:57:26 +0000 (11:57 -0700)]
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 the
default "console" terminal. When the EFI fw console is configured to output to
both serial and video, this will cause GRUB to only display on video - while
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>
6 years agoarm64/xen: Add missing #address-cells and #size-cells properties
Julien Grall [Wed, 29 Nov 2017 17:08:12 +0000 (17:08 +0000)]
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-cells
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.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agogrub-mkconfig: Fix detecting .sig files as system images
Jordan Glover [Wed, 29 Nov 2017 13:35:37 +0000 (08:35 -0500)]
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.

Signed-off-by: Jordan Glover <Golden_Miller83@protonmail.ch>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoieee1275: Fix segfault in grub-ofpathname
Eric Snowberg [Tue, 28 Nov 2017 19:51:39 +0000 (11:51 -0800)]
ieee1275: Fix segfault in grub-ofpathname

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agogrub-install: Fix memory leak
Eric Snowberg [Mon, 27 Nov 2017 17:12:49 +0000 (09:12 -0800)]
grub-install: Fix memory leak

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agols: prevent double open
Eric Snowberg [Mon, 13 Nov 2017 16:27:28 +0000 (08:27 -0800)]
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);

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agotsc: Change default tsc calibration method to pmtimer on EFI systems
David E. Box [Fri, 15 Sep 2017 22:37:05 +0000 (15:37 -0700)]
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.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoefi: Free malloc regions on exit
Alexander Graf [Thu, 31 Aug 2017 14:40:19 +0000 (16:40 +0200)]
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.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoefi: Move grub_reboot() into kernel
Alexander Graf [Thu, 31 Aug 2017 14:40:18 +0000 (16:40 +0200)]
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.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoUse grub-file to figure out whether multiboot2 should be used for Xen.gz
Konrad Rzeszutek Wilk [Tue, 29 Aug 2017 20:40:53 +0000 (16:40 -0400)]
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.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoFix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
Konrad Rzeszutek Wilk [Tue, 29 Aug 2017 20:40:52 +0000 (16:40 -0400)]
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-ec082ee24aea41b9b16aca52a6d10cc2
 Found initrd image: /boot/initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.img
  echo 'Loading Linux 0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 ...'
  linux /vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 root=/dev/mapper/fedora_tst063-root ro single
  echo 'Loading initial ramdisk ...'
  initrd /initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.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>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoFix compilation for x86_64-efi.
Vladimir Serbinenko [Thu, 7 Sep 2017 11:55:22 +0000 (13:55 +0200)]
Fix compilation for x86_64-efi.

6 years agoAdd a file missing in multiboot2 commit.
Vladimir Serbinenko [Tue, 5 Sep 2017 21:13:55 +0000 (23:13 +0200)]
Add a file missing in multiboot2 commit.

6 years agogzio: fix unaligned access
Vladimir Serbinenko [Wed, 30 Aug 2017 18:46:14 +0000 (20:46 +0200)]
gzio: fix unaligned access

6 years agogrub-fs-tester: Fix bashism
Vladimir Serbinenko [Wed, 30 Aug 2017 15:22:58 +0000 (17:22 +0200)]
grub-fs-tester: Fix bashism

6 years agoRegenerate checksum.h with newer unifont.
Vladimir Serbinenko [Wed, 30 Aug 2017 15:12:04 +0000 (17:12 +0200)]
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

6 years agoprintf_unit_test: Disable Wformat-truncation on GCC >= 7
Vladimir Serbinenko [Wed, 30 Aug 2017 14:59:25 +0000 (16:59 +0200)]
printf_unit_test: Disable Wformat-truncation on GCC >= 7

We intentionally pass NULL as argument to format, hence disable the warning.

6 years agoqemu, coreboot, multiboot: Change linking address to 0x9000.
Vladimir Serbinenko [Wed, 30 Aug 2017 14:29:59 +0000 (16:29 +0200)]
qemu, coreboot, multiboot: Change linking address to 0x9000.

It's common for distros to use a defective ld which links at 0x9000. Instead
of fighting it, just move link target to 0x9000.

6 years agoImplement checksum verification for gunzip
Stefan Fritsch [Sun, 1 May 2016 12:32:30 +0000 (14:32 +0200)]
Implement checksum verification for gunzip

This implements the crc32 check for the gzip format. Support for zlib's
adler checksum is not included, yet.

6 years agoxfs: Don't attempt to iterate over empty directory.
Vladimir Serbinenko [Wed, 30 Aug 2017 13:56:19 +0000 (15:56 +0200)]
xfs: Don't attempt to iterate over empty directory.

Reported by: Tuomas Tynkkynen

6 years agounix exec: avoid atexit handlers when child exits
Patrick Steinhardt [Mon, 28 Aug 2017 18:57:19 +0000 (20:57 +0200)]
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.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
6 years agoarc: Do not create spurious variable grub_arc_memory_type_t.
Vladimir Serbinenko [Wed, 30 Aug 2017 13:18:24 +0000 (15:18 +0200)]
arc: Do not create spurious variable grub_arc_memory_type_t.

6 years agoSet have_exec to y on cygwin so we have grub_mkrescue.
Xuan Guo [Mon, 14 Aug 2017 14:27:53 +0000 (16:27 +0200)]
Set have_exec to y on cygwin so we have grub_mkrescue.

6 years agoenforcing fixup
Vladimir Serbinenko [Mon, 14 Aug 2017 14:27:10 +0000 (16:27 +0200)]
enforcing fixup

6 years agomultiboot fixup
Vladimir Serbinenko [Mon, 14 Aug 2017 14:24:05 +0000 (16:24 +0200)]
multiboot fixup

6 years agolinux fixup
Vladimir Serbinenko [Mon, 14 Aug 2017 14:23:52 +0000 (16:23 +0200)]
linux fixup

6 years agoyylex: Explicilty cast fprintf to void.
Vladimir Serbinenko [Mon, 14 Aug 2017 12:11:43 +0000 (14:11 +0200)]
yylex: Explicilty cast fprintf to void.

It's needed to avoid warning on recent GCC.

6 years agogenmoddep: Check that no modules provide the same symbol.
Vladimir Serbinenko [Mon, 14 Aug 2017 12:10:48 +0000 (14:10 +0200)]
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.

6 years agoFix symbols appearing in several modules in linux*.
Vladimir Serbinenko [Mon, 14 Aug 2017 12:09:30 +0000 (14:09 +0200)]
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.

6 years agomultiboot: disentangle multiboot and multiboot2.
Vladimir Serbinenko [Mon, 14 Aug 2017 10:51:26 +0000 (12:51 +0200)]
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

6 years agohdparm: Depend on hexdump rather than having a second copy of hexdump.
Vladimir Serbinenko [Mon, 14 Aug 2017 10:48:58 +0000 (12:48 +0200)]
hdparm: Depend on hexdump rather than having a second copy of hexdump.

6 years agogrub.texi: Fix typo
Vladimir Serbinenko [Mon, 14 Aug 2017 09:36:50 +0000 (11:36 +0200)]
grub.texi: Fix typo

Reported by:  Ori Avtalion <saltyhorse>

6 years agoio: add a GRUB_GZ prefix to gzio specific defines
Pete Batard [Mon, 7 Aug 2017 15:23:12 +0000 (16:23 +0100)]
io: add a GRUB_GZ prefix to gzio specific defines

* This is done to avoid a conflict with a PACKED define in the EDK2

6 years agocore: use GRUB_TERM_ definitions when handling term characters
Pete Batard [Mon, 7 Aug 2017 15:20:30 +0000 (16:20 +0100)]
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 and is not understood by some compilers

6 years agoefi: change heap allocation type to GRUB_EFI_LOADER_CODE
Leif Lindholm [Thu, 3 Aug 2017 10:04:32 +0000 (11:04 +0100)]
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

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
6 years agoarm64 linux loader: improve type portability
Leif Lindholm [Thu, 3 Aug 2017 10:04:26 +0000 (11:04 +0100)]
arm64 linux loader: improve type portability

In preparation for turning this into a common loader for 32-bit and 64-bit
platforms, ensure the code will compile cleanly for either.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
6 years agoefi: Add GRUB_PE32_MAGIC definition
Leif Lindholm [Thu, 3 Aug 2017 10:04:25 +0000 (11:04 +0100)]
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.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
6 years agoefi: move fdt helper library
Leif Lindholm [Thu, 3 Aug 2017 10:04:24 +0000 (11:04 +0100)]
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.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
6 years agoRemove grub_efi_allocate_pages.
Vladimir Serbinenko [Mon, 7 Aug 2017 16:33:29 +0000 (18:33 +0200)]
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 at.

6 years agoefi: refactor grub_efi_allocate_pages
Leif Lindholm [Thu, 3 Aug 2017 10:04:23 +0000 (11:04 +0100)]
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.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
6 years agoFail if xorriso failed.
Vladimir Serbinenko [Mon, 7 Aug 2017 16:08:39 +0000 (18:08 +0200)]
Fail if xorriso failed.

If xorriso failed most likely we didn't generate a meaningful image.

6 years agomkrescue: Check xorriso presence before doing anything else.
Vladimir Serbinenko [Mon, 7 Aug 2017 16:05:17 +0000 (18:05 +0200)]
mkrescue: Check xorriso presence before doing anything else.

mkrescue can't do anything useful without xorriso, so abort early if it's
not available.

6 years ago* grub-core/fs/udf.c: Add support for UUID
Pali Rohár [Thu, 22 Jun 2017 12:42:16 +0000 (14:42 +0200)]
* 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 UUID
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 lowercase
   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.

6 years agoudf: Fix reading label, lvd.ident is dstring
Pali Rohár [Thu, 22 Jun 2017 12:33:17 +0000 (14:33 +0200)]
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).

6 years agozfs: remove size_t typedef and use grub_size_t instead
Pete Batard [Thu, 3 Aug 2017 14:46:15 +0000 (15:46 +0100)]
zfs: remove size_t typedef and use grub_size_t instead

* Prevents some toolchains from issuing a warning on size_t redef.

6 years agoFix a segfault in lsefi
Rob Clark [Wed, 19 Jul 2017 19:47:41 +0000 (15:47 -0400)]
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.

Signed-off-by: Peter Jones <pjones@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agofdt: silence clang warning.
Vladimir Serbinenko [Mon, 10 Jul 2017 01:34:22 +0000 (01:34 +0000)]
fdt: silence clang warning.

6 years agoarm-efi: Fix compilation
Vladimir Serbinenko [Sun, 9 Jul 2017 21:48:37 +0000 (21:48 +0000)]
arm-efi: Fix compilation

6 years agocrypto: Fix use after free.
AppChecker [Sun, 9 Jul 2017 19:57:35 +0000 (21:57 +0200)]
crypto: Fix use after free.

Reported by: AppChecker
Transformed to patch by: Satish Govindarajan

6 years agoehci: Fix compilation on i386
Vladimir Serbinenko [Sun, 9 Jul 2017 19:31:19 +0000 (21:31 +0200)]
ehci: Fix compilation on i386

6 years agocache: Fix compilation for ppc, sparc and arm64
phcoder [Sun, 9 Jul 2017 18:59:15 +0000 (20:59 +0200)]
cache: Fix compilation for ppc, sparc and arm64

6 years agoehci: Fix compilation for amd64
phcoder [Sun, 9 Jul 2017 18:58:31 +0000 (20:58 +0200)]
ehci: Fix compilation for amd64

6 years agoAllow GRUB to mount ext2/3/4 filesystems that have the encryption feature.
Eric Biggers [Thu, 29 Jun 2017 13:27:49 +0000 (13:27 +0000)]
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+.

Signed-off-by: Eric Biggers <ebiggers@google.com>
6 years agosparc64: Don't use devspec to determine the OBP path
Eric Snowberg [Thu, 18 May 2017 23:10:22 +0000 (17:10 -0600)]
sparc64: Don't use devspec to determine the OBP path

Don't use devspec to determine the OBP path on SPARC hardware.  Within all
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

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoarm64: Update the introduction of Xen boot commands in docs/grub.texi
Fu Wei [Sun, 14 May 2017 07:43:47 +0000 (15:43 +0800)]
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.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoutil/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64
Fu Wei [Sun, 14 May 2017 07:43:46 +0000 (15:43 +0800)]
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 and
commands to boot xen hypervisor and Dom0, but not multiboot.

For other architectures, they are still using multiboot and module
commands.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoarm64: Add "--nounzip" option support in xen_module command
Fu Wei [Sun, 14 May 2017 07:43:45 +0000 (15:43 +0800)]
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).

Signed-off-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agoarm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
Julien Grall [Fri, 19 Feb 2016 16:28:52 +0000 (16:28 +0000)]
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.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Tested-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 years agosparc64: Close cdboot ihandle
Eric Snowberg [Fri, 12 May 2017 01:42:23 +0000 (18:42 -0700)]
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

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
7 years agoat_keyboard: Fix falco chromebook case.
Vladimir Serbinenko [Tue, 9 May 2017 12:27:52 +0000 (14:27 +0200)]
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.

7 years agocoreboot: Changed cbmemc to support updated console format from coreboot.
Julius Werner [Tue, 9 May 2017 07:03:02 +0000 (09:03 +0200)]
coreboot: Changed cbmemc to support updated console format from coreboot.

7 years agoMissing parts of previous commit
Vladimir Serbinenko [Tue, 9 May 2017 07:02:15 +0000 (09:02 +0200)]
Missing parts of previous commit

7 years agoarm_coreboot: Add Chromebook keyboard driver.
Vladimir Serbinenko [Tue, 9 May 2017 06:47:34 +0000 (08:47 +0200)]
arm_coreboot: Add Chromebook keyboard driver.

7 years agork3288_spi: Add SPI driver
Vladimir Serbinenko [Tue, 9 May 2017 06:42:14 +0000 (08:42 +0200)]
rk3288_spi: Add SPI driver

7 years agofdtbus: Add ability to send/receive messages on parent busses.
Vladimir Serbinenko [Tue, 9 May 2017 06:40:29 +0000 (08:40 +0200)]
fdtbus: Add ability to send/receive messages on parent busses.

7 years agoFix bug on FDT nodes with compatible property
Vladimir Serbinenko [Tue, 9 May 2017 06:39:40 +0000 (08:39 +0200)]
Fix bug on FDT nodes with compatible property

7 years agoarm_coreboot: Support EHCI.
Vladimir Serbinenko [Mon, 8 May 2017 20:14:28 +0000 (22:14 +0200)]
arm_coreboot: Support EHCI.

7 years agoehci: Split core code from PCI part.
Vladimir Serbinenko [Mon, 8 May 2017 20:10:26 +0000 (22:10 +0200)]
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.

7 years agoarm_coreboot: Support DMA.
Vladimir Serbinenko [Mon, 8 May 2017 20:06:04 +0000 (22:06 +0200)]
arm_coreboot: Support DMA.

This is needed to support USB and some other busses.

7 years agoarm_coreboot: Support loading linux images.
Vladimir Serbinenko [Mon, 8 May 2017 20:00:06 +0000 (22:00 +0200)]
arm_coreboot: Support loading linux images.

7 years agoarm_coreboot: Support grub-mkstandalone.
Vladimir Serbinenko [Mon, 8 May 2017 19:59:48 +0000 (21:59 +0200)]
arm_coreboot: Support grub-mkstandalone.

7 years agoarm_coreboot: Support keyboard for vexpress.
Vladimir Serbinenko [Mon, 8 May 2017 19:42:37 +0000 (21:42 +0200)]
arm_coreboot: Support keyboard for vexpress.

7 years agoat_keyboard: Split protocol from controller code.
Vladimir Serbinenko [Mon, 8 May 2017 19:41:22 +0000 (21:41 +0200)]
at_keyboard: Split protocol from controller code.

On vexpress controller is different but protocol is the same, so reuse the
code.

7 years agoarm-coreboot: Export FDT routines.
Vladimir Serbinenko [Mon, 8 May 2017 19:29:48 +0000 (21:29 +0200)]
arm-coreboot: Export FDT routines.

We need to use them from modules as well.

7 years agoarm-coreboot: Support for vexpress timer.
Vladimir Serbinenko [Mon, 8 May 2017 19:26:36 +0000 (21:26 +0200)]
arm-coreboot: Support for vexpress timer.

7 years agoAdd support for device-tree-based drivers.
Vladimir Serbinenko [Mon, 8 May 2017 19:19:59 +0000 (21:19 +0200)]
Add support for device-tree-based drivers.

7 years agoarm-coreboot: Start new port.
Vladimir Serbinenko [Mon, 8 May 2017 18:53:28 +0000 (20:53 +0200)]
arm-coreboot: Start new port.

7 years agoRename uboot/datetime to dummy/datetime.
Vladimir Serbinenko [Mon, 8 May 2017 17:37:29 +0000 (19:37 +0200)]
Rename uboot/datetime to dummy/datetime.

It's just a stub and is not UBoot-specific.

7 years agoRename uboot/halt.c to dummy/halt.c.
Vladimir Serbinenko [Mon, 8 May 2017 17:31:55 +0000 (19:31 +0200)]
Rename uboot/halt.c to dummy/halt.c.

It's not U-Boot specific and it's a stub.

7 years agocoreboot: Split parts that are platform-independent.
Vladimir Serbinenko [Mon, 8 May 2017 17:06:22 +0000 (19:06 +0200)]
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.

7 years agoRefactor arm-uboot code to make it genereic.
Vladimir Serbinenko [Mon, 8 May 2017 15:47:57 +0000 (17:47 +0200)]
Refactor arm-uboot code to make it genereic.

arm-coreboot startup code can be very similar to arm-uboot but current code has
U-Boot specific references. So split U-Boot part from generic part.

7 years agomkimage: Pass layout to mkimage_generate_elfXX rather than some fields.
Vladimir Serbinenko [Mon, 8 May 2017 15:32:15 +0000 (17:32 +0200)]
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.

7 years agoAdd Virtual LAN support.
Paulo Flabiano Smorigo [Mon, 23 Dec 2013 14:32:02 +0000 (12:32 -0200)]
Add Virtual LAN support.

This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
multiple VLANs in a bridged network to share the same physical network link
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.

7 years agostrtoull: Fix behaviour on chars between '9' and 'a'.
Vladimir Serbinenko [Wed, 10 Aug 2016 15:49:42 +0000 (17:49 +0200)]
strtoull: Fix behaviour on chars between '9' and 'a'.

Reported by: Aaron Miller <aaronmiller@fb.com>

7 years agoAdd strtoull test.
Vladimir Serbinenko [Wed, 3 May 2017 10:58:15 +0000 (12:58 +0200)]
Add strtoull test.

7 years agoFix shebang for termux.
Vladimir Serbinenko [Sun, 22 Jan 2017 17:22:34 +0000 (20:22 +0300)]
Fix shebang for termux.

Termux doesn't have a /bin/sh. So we needto use $SHELL.
Keep /bin/sh as much as possible.

7 years agoAdd termux path to dict.
Vladimir Serbinenko [Mon, 23 Jan 2017 11:52:48 +0000 (14:52 +0300)]
Add termux path to dict.

7 years agopo: Use @SHELL@ rather than /bin/sh.
Vladimir Serbinenko [Mon, 23 Jan 2017 11:54:03 +0000 (14:54 +0300)]
po: Use @SHELL@ rather than /bin/sh.

/bin/sh might not exist.

7 years agoUse $(SHELL) rather than /bin/sh.
Vladimir Serbinenko [Sun, 22 Jan 2017 21:55:30 +0000 (00:55 +0300)]
Use $(SHELL) rather than /bin/sh.

/bin/sh doesn't exist under termux.

7 years agoSupport lseek64.
Vladimir Serbinenko [Mon, 23 Jan 2017 17:21:05 +0000 (20:21 +0300)]
Support lseek64.

Android doesn't have 64-bit off_t, so use off64_t instead.

7 years agoDon't retrieve fstime when it's not useful.
Vladimir Serbinenko [Mon, 23 Jan 2017 18:24:05 +0000 (21:24 +0300)]
Don't retrieve fstime when it's not useful.

7 years agosupport busybox date.
Vladimir Serbinenko [Mon, 23 Jan 2017 11:31:36 +0000 (14:31 +0300)]
support busybox date.

Busybox date doesn't understand weekdays in -d input,
so strip them beforehand.

7 years agofs-tester: make sh-compatible
Vladimir Serbinenko [Mon, 23 Jan 2017 11:35:59 +0000 (14:35 +0300)]
fs-tester: make sh-compatible

7 years agoRemove bashisms from tests.
Vladimir Serbinenko [Mon, 23 Jan 2017 00:47:13 +0000 (03:47 +0300)]
Remove bashisms from tests.

Those tests don't actually need bash. Just use common shebang.

7 years agoBump version to 2.03
Vladimir Serbinenko [Wed, 3 May 2017 09:55:52 +0000 (11:55 +0200)]
Bump version to 2.03

7 years agoIncrease version to 2.02.
Vladimir Serbinenko [Tue, 25 Apr 2017 14:23:16 +0000 (16:23 +0200)]
Increase version to 2.02.

7 years agoFix remaining cases of gcc 7 fallthrough warning.
Vladimir Serbinenko [Wed, 12 Apr 2017 01:42:38 +0000 (01:42 +0000)]
Fix remaining cases of gcc 7 fallthrough warning.

They are all intended, so just add the relevant comment.

7 years agoAdd gnulib-fix-gcc7-fallthrough.diff
Andrei Borzenkov [Tue, 4 Apr 2017 16:37:47 +0000 (19:37 +0300)]
Add gnulib-fix-gcc7-fallthrough.diff

As long as the code is not upstream, add it as explicit patch for the
case of gnulib refresh.