[PATCH] verifiers: fix calling uninitialized function pointer

[PATCH] verifiers: fix calling uninitialized function pointer

[Michael Chang]

The necessary check for null before use of function ver->close is not
taking place in the failure path. This patch simply adds the missing
check and fixes the problem that grub hangs indefinitely after booting
rogue image without valid signature if secure boot turned on.

Now it displays like this for booting rogue uefi image.

error: bad shim signature
error: you need to load the kernel first

Press any key to continue...

and then you can go back to boot menu by pressing any key or after a few
seconds expired.

Signed-off-by: Michael Chang <mchang@suse.com>
---
 grub-core/commands/verifiers.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
index 0dde48182..7b9297cd3 100644
--- a/grub-core/commands/verifiers.c
+++ b/grub-core/commands/verifiers.c
@@ -196,7 +196,8 @@ grub_verifiers_open (grub_file_t io, enum grub_file_type type)
   return ret;
 
  fail:
-  ver->close (context);
+  if (ver->close)
+    ver->close (context);
  fail_noclose:
   verified_free (verified);
   grub_free (ret);
-- 
2.16.4

Re: [PATCH] verifiers: fix calling uninitialized function pointer

[Javier Martinez Canillas]

On 2/18/20 11:08 AM, Michael Chang wrote:
> The necessary check for null before use of function ver->close is not
> taking place in the failure path. This patch simply adds the missing
> check and fixes the problem that grub hangs indefinitely after booting
> rogue image without valid signature if secure boot turned on.
> 
> Now it displays like this for booting rogue uefi image.
> 
> error: bad shim signature
> error: you need to load the kernel first
> 
> Press any key to continue...
> 
> and then you can go back to boot menu by pressing any key or after a few
> seconds expired.
> 
> Signed-off-by: Michael Chang <mchang@suse.com>
> ---

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>

Best regards,
Javier

Re: [PATCH] verifiers: fix calling uninitialized function pointer

[Daniel Kiper]

On Tue, Feb 18, 2020 at 12:44:30PM +0100, Javier Martinez Canillas wrote:
> On 2/18/20 11:08 AM, Michael Chang wrote:
> > The necessary check for null before use of function ver->close is not
> > taking place in the failure path. This patch simply adds the missing
> > check and fixes the problem that grub hangs indefinitely after booting
> > rogue image without valid signature if secure boot turned on.
> >
> > Now it displays like this for booting rogue uefi image.
> >
> > error: bad shim signature
> > error: you need to load the kernel first
> >
> > Press any key to continue...
> >
> > and then you can go back to boot menu by pressing any key or after a few
> > seconds expired.
> >
> > Signed-off-by: Michael Chang <mchang@suse.com>
> > ---
>
> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> and pushed...

Thanks,

Daniel