diff options
| author | Ignat Korchagin <ignat@cloudflare.com> | 2020-07-21 22:27:08 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2020-07-22 12:54:18 +0100 |
| commit | b76052335788d0ad2c4b0bded116c3b02dd4bbc2 (patch) | |
| tree | cf81b538095e393dc6105bcbe340fbac89ec1570 | |
| parent | a08ee6e7221ea50d9096579d57674a07f3409da3 (diff) | |
| download | ipxe-b76052335788d0ad2c4b0bded116c3b02dd4bbc2.zip ipxe-b76052335788d0ad2c4b0bded116c3b02dd4bbc2.tar.gz ipxe-b76052335788d0ad2c4b0bded116c3b02dd4bbc2.tar.bz2 | |
[efi] Check the status code from AllocatePool()
According to the latest UEFI specification (Version 2.8 Errata B)
p. 7.2:
"Buffer: A pointer to a pointer to the allocated buffer if the call
succeeds; undefined otherwise."
So implementations are obliged neither to return NULL, if the
allocation fails, nor to preserve the contents of the pointer.
Make the logic more reliable by checking the status code from
AllocatePool() instead of checking the returned pointer for NULL
Signed-off-by: Ignat Korchagin <ignat@cloudflare.com>
Modified-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/interface/efi/efi_snp_hii.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/interface/efi/efi_snp_hii.c b/src/interface/efi/efi_snp_hii.c index 651bef0..1e681a4 100644 --- a/src/interface/efi/efi_snp_hii.c +++ b/src/interface/efi/efi_snp_hii.c @@ -247,16 +247,17 @@ static int efi_snp_hii_append ( struct efi_snp_device *snpdev __unused, const char *key, const char *value, wchar_t **results ) { EFI_BOOT_SERVICES *bs = efi_systab->BootServices; + EFI_STATUS efirc; size_t len; void *new; /* Allocate new string */ len = ( ( *results ? ( wcslen ( *results ) + 1 /* "&" */ ) : 0 ) + strlen ( key ) + 1 /* "=" */ + strlen ( value ) + 1 /* NUL */ ); - bs->AllocatePool ( EfiBootServicesData, ( len * sizeof ( wchar_t ) ), - &new ); - if ( ! new ) - return -ENOMEM; + if ( ( efirc = bs->AllocatePool ( EfiBootServicesData, + ( len * sizeof ( wchar_t ) ), + &new ) ) != 0 ) + return -EEFI ( efirc ); /* Populate string */ efi_snprintf ( new, len, "%ls%s%s=%s", ( *results ? *results : L"" ), |