[5/6] efi/x86: add missing NULL initialization in UGA draw protocol discovery

Message ID 20180712122154.13819-6-ard.biesheuvel@linaro.org
State Accepted
Commit 093174f52553532b9eb0e63cbbb254f6990d46d5
Headers show
  • efi/x86 mixed mode cleanups
Related show

Commit Message

Ard Biesheuvel July 12, 2018, 12:21 p.m.
The UGA draw protocol discovery routine looks for a EFI handle that has
both the UGA draw protocol and the PCI I/O protocol installed. It checks
for the latter by calling handle_protocol() and pass it a PCI I/O
protocol pointer variable by reference, but fails to initialize it to
NULL, which means the non-NULL check later on in the code could produce
false positives, given that the return code of the handle_protocol() call
is ignored entirely. So add the missing initialization.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

 arch/x86/boot/compressed/eboot.c | 1 +
 1 file changed, 1 insertion(+)


To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index ac8e442db71f..92b573fd239c 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -359,6 +359,7 @@  setup_uga(struct screen_info *si, efi_guid_t *uga_proto, unsigned long size)
 		if (status != EFI_SUCCESS)
+		pciio = NULL;
 		efi_call_early(handle_protocol, handle, &pciio_proto, &pciio);
 		status = efi_call_proto(efi_uga_draw_protocol, get_mode, uga,