From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Fri, 17 May 2019 10:47:17 +0000 (+0200)
Subject: efi_loader: GetNextMonotonicCount() check parameter
X-Git-Tag: v2019.07-rc3~20^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1344f7d0f61d94fe475aeadb000ac6cafccd3920;p=oweals%2Fu-boot.git

efi_loader: GetNextMonotonicCount() check parameter

Do not write to address indicated by NULL pointer.

UEFI SCT II 2.6 (2017), 3.6.5 GetNextMonotonicCount(), 5.1.5.5.1

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index ce6ca06f75..971bd5ffa3 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -1916,10 +1916,17 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
 static efi_status_t EFIAPI efi_get_next_monotonic_count(uint64_t *count)
 {
 	static uint64_t mono;
+	efi_status_t ret;
 
 	EFI_ENTRY("%p", count);
+	if (!count) {
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
 	*count = mono++;
-	return EFI_EXIT(EFI_SUCCESS);
+	ret = EFI_SUCCESS;
+out:
+	return EFI_EXIT(ret);
 }
 
 /**