[PATCH 10/10] efi/libstub: Check return value of efi_parse_options

[Arvind Sankar]

efi_parse_options can fail if it is unable to allocate space for a copy
of the command line. Check the return value to make sure it succeeded.

Signed-off-by: Arvind Sankar <nived...@alum.mit.edu>
---
 drivers/firmware/efi/libstub/efi-stub.c | 18 ++++++++++++++----
 drivers/firmware/efi/libstub/x86-stub.c | 12 ++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/drivers/firmware/efi/libstub/efi-stub.c 
b/drivers/firmware/efi/libstub/efi-stub.c
index 930302d9415a..a4399537b4e6 100644
--- a/drivers/firmware/efi/libstub/efi-stub.c
+++ b/drivers/firmware/efi/libstub/efi-stub.c
@@ -207,11 +207,21 @@ efi_status_t efi_entry(efi_handle_t handle, 
efi_system_table_t *sys_table_arg)
 
        if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||
            IS_ENABLED(CONFIG_CMDLINE_FORCE) ||
-           cmdline_size == 0)
-               efi_parse_options(CONFIG_CMDLINE);
+           cmdline_size == 0) {
+               status = efi_parse_options(CONFIG_CMDLINE);
+               if (status != EFI_SUCCESS) {
+                       pr_efi_err("Failed to parse options\n");
+                       goto fail_free_cmdline;
+               }
+       }
 
-       if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_size > 0)
-               efi_parse_options(cmdline_ptr);
+       if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_size > 0) {
+               status = efi_parse_options(cmdline_ptr);
+               if (status != EFI_SUCCESS) {
+                       pr_efi_err("Failed to parse options\n");
+                       goto fail_free_cmdline;
+               }
+       }
 
        pr_efi("Booting Linux Kernel...\n");
 
diff --git a/drivers/firmware/efi/libstub/x86-stub.c 
b/drivers/firmware/efi/libstub/x86-stub.c
index 0faba30d6406..ca549f26f45d 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -739,12 +739,20 @@ unsigned long efi_main(efi_handle_t handle,
        }
 
 #ifdef CONFIG_CMDLINE_BOOL
-       efi_parse_options(CONFIG_CMDLINE);
+       status = efi_parse_options(CONFIG_CMDLINE);
+       if (status != EFI_SUCCESS) {
+               pr_efi_err("Failed to parse options\n");
+               goto fail;
+       }
 #endif
        if (!IS_ENABLED(CONFIG_CMDLINE_OVERRIDE)) {
                unsigned long cmdline_paddr = ((u64)hdr->cmd_line_ptr |
                                               
((u64)boot_params->ext_cmd_line_ptr << 32));
-               efi_parse_options((char *)cmdline_paddr);
+               status = efi_parse_options((char *)cmdline_paddr);
+               if (status != EFI_SUCCESS) {
+                       pr_efi_err("Failed to parse options\n");
+                       goto fail;
+               }
        }
 
        /*
-- 
2.26.2