diff options
| author | Ingo Molnar <[email protected]> | 2015-07-31 09:55:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-07-31 09:55:26 +0200 |
| commit | 1adb9123f96a2553b5b373aff1eb6ae939d31d5c (patch) | |
| tree | a1a60202f48fb8cd62b78bad423b8088e8438105 /drivers/firmware/efi/efi.c | |
| parent | 646c4b75494747887f936513b669bb8a2d794459 (diff) | |
| parent | 9115c7589b11349a1c3099758b4bded579ff69e0 (diff) | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming:
* Fix an EFI boot issue preventing a Parallels virtual machine from
booting because the upper 32-bits of the EFI memmap pointer were
being discarded in setup_e820(). (Dmitry Skorodumov)
* Validate that the "efi" kernel parameter gets used with an argument,
otherwise we will oops. (Ricardo Neri)
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/firmware/efi/efi.c')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 9fa8084a7c8d..d6144e3b97c5 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -58,6 +58,11 @@ bool efi_runtime_disabled(void) static int __init parse_efi_cmdline(char *str) { + if (!str) { + pr_warn("need at least one option\n"); + return -EINVAL; + } + if (parse_option_str(str, "noruntime")) disable_runtime = true; |