From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date: Tue, 4 Nov 2025 22:27:12 +0000 (+0100)
Subject: efi_client: efi_store_memory_map() must return int
X-Git-Tag: v2026.01-rc2~19^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a30ddeda9a5120dca0a9b9c9673d24b375cdc34;p=thirdparty%2Fu-boot.git

efi_client: efi_store_memory_map() must return int

The type efi_status_t is not compatible with the return type int.

Let efi_store_memory_map() return -EFAULT instead of a truncated EFI error
code.

Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---

diff --git a/lib/efi_client/efi.c b/lib/efi_client/efi.c
index bcb34d67465..a3a40b5549d 100644
--- a/lib/efi_client/efi.c
+++ b/lib/efi_client/efi.c
@@ -155,7 +155,7 @@ int efi_store_memory_map(struct efi_priv *priv)
 		putc(' ');
 		printhex2(ret);
 		puts(" No memory map\n");
-		return ret;
+		return -EFAULT;
 	}
 	/*
 	 * Since doing a malloc() may change the memory map and also we want to
@@ -168,7 +168,7 @@ int efi_store_memory_map(struct efi_priv *priv)
 	if (!priv->memmap_desc) {
 		printhex2(ret);
 		puts(" No memory for memory descriptor\n");
-		return ret;
+		return -EFAULT;
 	}
 
 	ret = boot->get_memory_map(&priv->memmap_size, priv->memmap_desc,
@@ -177,7 +177,7 @@ int efi_store_memory_map(struct efi_priv *priv)
 	if (ret) {
 		printhex2(ret);
 		puts(" Can't get memory map\n");
-		return ret;
+		return -EFAULT;
 	}
 
 	return 0;