efi_loader: Fix memory corruption on 32bit systems
PATCH v2 1/1 efi_loader: Fix memory corruption on 32bit systems
The issue is this line:
new_efi = efi_prepare_aligned_image(efi, (u64 *)&efi_size);
The efi_size variable is type size_t and on a 32 bit system that's 32 bits. The u64 type is obviously 64 bits. So we write 8 bytes to a 4 byte buffer which corrupts memory.
Fix this by changing the type of efi_prepare_aligned_image() to a size_t pointer.
---
v2: Change efi_prepare_aligned_image() instead of changing efi_image_authenticate(). This is a cleaner way to fix the problem.
include/efi_loader.h | 2 +- lib/efi_loader/efi_image_loader.c | 4 ++-- lib/efi_loader/efi_tcg2.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
include/efi_loader.h +1 -1
@@ -1022,7 +1022,7 @@ bool efi_secure_boot_enabled(void);bool efi_capsule_auth_enabled (void ); -void *efi_prepare_aligned_image (void *efi,u64 *efi_size); +void *efi_prepare_aligned_image (void *efi,size_t *efi_size);bool efi_image_parse (void *efi,size_t len,struct efi_image_regions **regp,WIN_CERTIFICATE **auth,size_t *auth_len);
lib/efi_loader/efi_image_loader.c +2 -2
@@ -313,7 +313,7 @@ static int cmp_pe_section(const void *arg1, const void *arg2)* * Return: valid pointer to a image, return NULL if allocation fails. */ -void *efi_prepare_aligned_image (void *efi,u64 *efi_size) +void *efi_prepare_aligned_image (void *efi,size_t *efi_size) {size_t new_efi_size;void *new_efi;
@@ -600,7 +600,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size)if (!efi_secure_boot_enabled ())return true; - new_efi =efi_prepare_aligned_image (efi, (u64 *)&efi_size); + new_efi =efi_prepare_aligned_image (efi, &efi_size);if (!new_efi)return false;
lib/efi_loader/efi_tcg2.c +1 -1
@@ -882,7 +882,7 @@ out:* * Return: status code */ -static efi_status_t tcg2_hash_pe_image (void *efi,u64 efi_size, +static efi_status_t tcg2_hash_pe_image (void *efi,size_t efi_size,struct tpml_digest_values *digest_list) {WIN_CERTIFICATE *wincerts =NULL ;
Signature · 1 line
2.39.2
Hi Dan,
[...]
Quoted 23 lines
lib/efi_loader/efi_image_loader.c +2
-2@@ -313,7 +313,7 @@ static int cmp_pe_section(const void *arg1, const void *arg2)* * Return: valid pointer to a image, return NULL if allocation fails. */ -void *efi_prepare_aligned_image (void *efi,u64 *efi_size) +void *efi_prepare_aligned_image (void *efi,size_t *efi_size) {size_t new_efi_size;void *new_efi;@@ -600,7 +600,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size)if (!efi_secure_boot_enabled ())return true; - new_efi =efi_prepare_aligned_image (efi, (u64 *)&efi_size); + new_efi =efi_prepare_aligned_image (efi, &efi_size);if (!new_efi)return false;lib/efi_loader/efi_tcg2.c +0
-0
lib/efi_loader/efi_tcg2.c out: · line 886
Quoted 6 lines
lib/efi_loader/efi_tcg2.c +1
-1@@ -882,7 +882,7 @@ out:* * Return: status code */ -static efi_status_t tcg2_hash_pe_image (void *efi,u64 efi_size, +static efi_status_t tcg2_hash_pe_image (void *efi,size_t efi_size,struct tpml_digest_values *digest_list)
Unfortunately the rabbit hole is a bit deeper with this one. tcg2_hash_pe_image() is called in
- tcg2_measure_pe_image(). This one is called in efi_load_pe() and the type is indeed a size_t there, so that's fine
- efi_tcg2_hash_log_extend_event(), this one is different... The function is described by the EFI spec [0] which mandates a u64... I think that was the reason efi_prepare_aligned_image() is using a u64 to begin with. This one uses the size only though not the pointer, but in a 32bit platform it would truncate s size > UINT_MAX.
Regards
/Ilias
Quoted 5 lines
lib/efi_loader/efi_tcg2.c +0
-0{WIN_CERTIFICATE *wincerts =NULL ;Signature · 1 line
2.39.2
Quoted 44 lines · Ilias Apalodimas
Hi Dan,
[...]
Quoted 23 lines
lib/efi_loader/efi_image_loader.c +2
-2@@ -313,7 +313,7 @@ static int cmp_pe_section(const void *arg1, const void *arg2)* * Return: valid pointer to a image, return NULL if allocation fails. */ -void *efi_prepare_aligned_image (void *efi,u64 *efi_size) +void *efi_prepare_aligned_image (void *efi,size_t *efi_size) {size_t new_efi_size;void *new_efi;@@ -600,7 +600,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size)if (!efi_secure_boot_enabled ())return true; - new_efi =efi_prepare_aligned_image (efi, (u64 *)&efi_size); + new_efi =efi_prepare_aligned_image (efi, &efi_size);if (!new_efi)return false;lib/efi_loader/efi_tcg2.c +0
-0lib/efi_loader/efi_tcg2.c out: · line 886
Quoted 6 lines
lib/efi_loader/efi_tcg2.c +1
-1@@ -882,7 +882,7 @@ out:* * Return: status code */ -static efi_status_t tcg2_hash_pe_image (void *efi,u64 efi_size, +static efi_status_t tcg2_hash_pe_image (void *efi,size_t efi_size,struct tpml_digest_values *digest_list)Unfortunately the rabbit hole is a bit deeper with this one.
tcg2_hash_pe_image()is called in
-tcg2_measure_pe_image(). This one is called inefi_load_pe()and the type is indeed asize_tthere, so that's fine
-efi_tcg2_hash_log_extend_event(), this one is different... The function is described by the EFI spec [0] which mandates a u64... I think that was the reasonefi_prepare_aligned_image()is using a u64 to begin with. This one uses the size only though not the pointer, but in a 32bit platform it would truncate s size >UINT_MAX.
Quoted 1 line
I have maybe misread something... I don't think this is a real issue. 32bit systems aren't going to be able to allocate that much memory anyway. Also there are a lot of size_t parameters already so it's not a new issue.
regards,
dan carpenter
Hi,
Quoted 46 lines · Dan Carpenter
Quoted 44 lines · Ilias Apalodimas
Hi Dan,
[...]
Quoted 23 lines
lib/efi_loader/efi_image_loader.c +2
-2@@ -313,7 +313,7 @@ static int cmp_pe_section(const void *arg1, const void *arg2)* * Return: valid pointer to a image, return NULL if allocation fails. */ -void *efi_prepare_aligned_image (void *efi,u64 *efi_size) +void *efi_prepare_aligned_image (void *efi,size_t *efi_size) {size_t new_efi_size;void *new_efi;@@ -600,7 +600,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size)if (!efi_secure_boot_enabled ())return true; - new_efi =efi_prepare_aligned_image (efi, (u64 *)&efi_size); + new_efi =efi_prepare_aligned_image (efi, &efi_size);if (!new_efi)return false;lib/efi_loader/efi_tcg2.c +0
-0lib/efi_loader/efi_tcg2.c out: · line 886
Quoted 6 lines
lib/efi_loader/efi_tcg2.c +1
-1@@ -882,7 +882,7 @@ out:* * Return: status code */ -static efi_status_t tcg2_hash_pe_image (void *efi,u64 efi_size, +static efi_status_t tcg2_hash_pe_image (void *efi,size_t efi_size,struct tpml_digest_values *digest_list)Unfortunately the rabbit hole is a bit deeper with this one.
tcg2_hash_pe_image()is called in
-tcg2_measure_pe_image(). This one is called inefi_load_pe()and the type is indeed asize_tthere, so that's fine
-efi_tcg2_hash_log_extend_event(), this one is different... The function is described by the EFI spec [0] which mandates a u64... I think that was the reasonefi_prepare_aligned_image()is using a u64 to begin with. This one uses the size only though not the pointer, but in a 32bit platform it would truncate s size >UINT_MAX.
Quoted 6 lines
Quoted 1 line
I have maybe misread something... I don't think this is a real issue. 32bit systems aren't going to be able to allocate that much memory anyway. Also there are a lot of
size_tparameters already so it's not a new issue.
We should really use ulong for addresses and malloc() sizes.
Regards,
Simon
Am 28. Juli 2023 03:51:55 MESZ schrieb Simon Glass <[email protected]>:
Quoted 49 lines
Hi,
Quoted 46 lines · Dan Carpenter
Quoted 44 lines · Ilias Apalodimas
Hi Dan,
[...]
Quoted 23 lines
lib/efi_loader/efi_image_loader.c +2
-2@@ -313,7 +313,7 @@ static int cmp_pe_section(const void *arg1, const void *arg2)* * Return: valid pointer to a image, return NULL if allocation fails. */ -void *efi_prepare_aligned_image (void *efi,u64 *efi_size) +void *efi_prepare_aligned_image (void *efi,size_t *efi_size) {size_t new_efi_size;void *new_efi;@@ -600,7 +600,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size)if (!efi_secure_boot_enabled ())return true; - new_efi =efi_prepare_aligned_image (efi, (u64 *)&efi_size); + new_efi =efi_prepare_aligned_image (efi, &efi_size);if (!new_efi)return false;lib/efi_loader/efi_tcg2.c +0
-0lib/efi_loader/efi_tcg2.c out: · line 886
Quoted 6 lines
lib/efi_loader/efi_tcg2.c +1
-1@@ -882,7 +882,7 @@ out:* * Return: status code */ -static efi_status_t tcg2_hash_pe_image (void *efi,u64 efi_size, +static efi_status_t tcg2_hash_pe_image (void *efi,size_t efi_size,struct tpml_digest_values *digest_list)Unfortunately the rabbit hole is a bit deeper with this one.
tcg2_hash_pe_image()is called in
-tcg2_measure_pe_image(). This one is called inefi_load_pe()and the type is indeed asize_tthere, so that's fine
-efi_tcg2_hash_log_extend_event(), this one is different... The function is described by the EFI spec [0] which mandates a u64... I think that was the reasonefi_prepare_aligned_image()is using a u64 to begin with. This one uses the size only though not the pointer, but in a 32bit platform it would truncate s size >UINT_MAX.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
I have maybe misread something... I don't think this is a real issue. 32bit systems aren't going to be able to allocate that much memory anyway. Also there are a lot of
size_tparameters already so it's not a new issue.We should really use ulong for addresses and
malloc()sizes.
Please, do not abuse long.
According to the C specification the size of long is independent of the size of pointers.
Addresses should be pointers and sizes should be size_t.
Best regards
Heinrich