0092-script-execute-Fix-NULL-dereference-in-grub_script_e.patch 1.0 KB

1234567891011121314151617181920212223242526272829
  1. From 41ae93b2e6c75453514629bcfe684300e3aec0ce Mon Sep 17 00:00:00 2001
  2. From: Daniel Axtens <dja@axtens.net>
  3. Date: Fri, 3 Apr 2020 23:05:13 +1100
  4. Subject: [PATCH] script/execute: Fix NULL dereference in
  5. grub_script_execute_cmdline()
  6. Signed-off-by: Daniel Axtens <dja@axtens.net>
  7. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  8. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  9. ---
  10. grub-core/script/execute.c | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
  13. index 7e028e1..5ea2aef 100644
  14. --- a/grub-core/script/execute.c
  15. +++ b/grub-core/script/execute.c
  16. @@ -940,7 +940,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
  17. struct grub_script_argv argv = { 0, 0, 0 };
  18. /* Lookup the command. */
  19. - if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
  20. + if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args || ! argv.args[0])
  21. return grub_errno;
  22. for (i = 0; i < argv.argc; i++)
  23. --
  24. 2.14.2