OSDN Git Service

efi/libstub/arm: Fix spurious message that an initrd was loaded
authorArd Biesheuvel <ardb@kernel.org>
Sun, 29 Mar 2020 08:05:44 +0000 (10:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 29 Mar 2020 10:08:18 +0000 (12:08 +0200)
commit594e576d4b93b8cda3247542366b47e1b2ddc4dc
treeb90cf1010a424c0f007b3b953570a48113f124e3
parentc2136dceba9a329e997ccce3277d2084e21a8a04
efi/libstub/arm: Fix spurious message that an initrd was loaded

Commit:

  ec93fc371f014a6f ("efi/libstub: Add support for loading the initrd from a device path")

added a diagnostic print to the ARM version of the EFI stub that
reports whether an initrd has been loaded that was passed
via the command line using initrd=.

However, it failed to take into account that, for historical reasons,
the file loading routines return EFI_SUCCESS when no file was found,
and the only way to decide whether a file was loaded is to inspect
the 'size' argument that is passed by reference. So let's inspect
this returned size, to prevent the print from being emitted even if
no initrd was loaded at all.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
drivers/firmware/efi/libstub/arm-stub.c