[PATCH] Fix a segfault in lsefi

[PATCH] Fix a segfault in lsefi

[Peter Jones]

From: Rob Clark <rclark@redhat.com>

when protocols_per_handle returns error, we can't use the pointers we
passed to it, and that includes trusting num_protocols.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 grub-core/commands/efi/lsefi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c
index d901c3892..d1ce99af4 100644
--- a/grub-core/commands/efi/lsefi.c
+++ b/grub-core/commands/efi/lsefi.c
@@ -109,8 +109,10 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),
 
       status = efi_call_3 (grub_efi_system_table->boot_services->protocols_per_handle,
 			   handle, &protocols, &num_protocols);
-      if (status != GRUB_EFI_SUCCESS)
+      if (status != GRUB_EFI_SUCCESS) {
 	grub_printf ("Unable to retrieve protocols\n");
+	continue;
+      }
       for (j = 0; j < num_protocols; j++)
 	{
 	  for (k = 0; k < ARRAY_SIZE (known_protocols); k++)
-- 
2.13.3

Re: [PATCH] Fix a segfault in lsefi

[Daniel Kiper]

On Wed, Jul 19, 2017 at 03:47:41PM -0400, Peter Jones wrote:
> From: Rob Clark <rclark@redhat.com>
>
> when protocols_per_handle returns error, we can't use the pointers we
> passed to it, and that includes trusting num_protocols.
>
> Signed-off-by: Peter Jones <pjones@redhat.com>

LGTM, if there are no objections I will apply it next week.

Daniel

Re: [PATCH] Fix a segfault in lsefi

[Daniel Kiper]

On Thu, Jul 27, 2017 at 03:44:08PM +0200, Daniel Kiper wrote:
> On Wed, Jul 19, 2017 at 03:47:41PM -0400, Peter Jones wrote:
> > From: Rob Clark <rclark@redhat.com>
> >
> > when protocols_per_handle returns error, we can't use the pointers we
> > passed to it, and that includes trusting num_protocols.
> >
> > Signed-off-by: Peter Jones <pjones@redhat.com>
>
> LGTM, if there are no objections I will apply it next week.

Applied.

Daniel