mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-04 14:10:01 +00:00
arm-bsp/u-boot: drop EFI GetVariable() workarounds patches
The dropped u-boot patches are not required as the bug is from the SMM Gateway SP. A patch for the secure partitions has been added to fix the SMM Gateway behaviour. Patch 0048-Fix-UEFI-get_variable-with-small-buffer.patch has been added in commit "arm-bsp/secure-partitions: fix SMM gateway bug for EFI GetVariable()". Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Gowtham Suresh Kumar
committed by
Jon Mason
Jon Mason
parent
268f98c128
commit
44c58b3e55
-31
@@ -1,31 +0,0 @@
|
||||
From 7db27eeaba0fd5ddb1e49977bb7e342a1980aa3d Mon Sep 17 00:00:00 2001
|
||||
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
|
||||
Date: Sun, 12 Dec 2021 17:51:17 +0000
|
||||
Subject: [PATCH 19/27] Return proper error code when rx buffer is larger
|
||||
|
||||
ffa_mm_communicate should return EFI_BUFFER_TOO_SMALL when
|
||||
the buffer received from the secure world is larger than the
|
||||
comm buffer as this value is forwarded by mm_communicate.
|
||||
|
||||
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
|
||||
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
---
|
||||
lib/efi_loader/efi_variable_tee.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
|
||||
index b6be2b54a030..38655a9dbb7c 100644
|
||||
--- a/lib/efi_loader/efi_variable_tee.c
|
||||
+++ b/lib/efi_loader/efi_variable_tee.c
|
||||
@@ -358,7 +358,7 @@ static efi_status_t __efi_runtime ffa_mm_communicate(void *comm_buf, ulong comm_
|
||||
|
||||
if (rx_data_size > comm_buf_size) {
|
||||
unmap_sysmem(virt_shared_buf);
|
||||
- return EFI_OUT_OF_RESOURCES;
|
||||
+ return EFI_BUFFER_TOO_SMALL;
|
||||
}
|
||||
|
||||
efi_memcpy_runtime(comm_buf, virt_shared_buf, rx_data_size);
|
||||
--
|
||||
2.30.2
|
||||
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
From b81214dea7056c3877aa9eb775557dc4702660ec Mon Sep 17 00:00:00 2001
|
||||
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
|
||||
Date: Sun, 12 Dec 2021 17:58:08 +0000
|
||||
Subject: [PATCH 21/27] Update comm_buf when EFI_BUFFER_TOO_SMALL
|
||||
|
||||
When the received buffer is larger than the comm buffer,
|
||||
the contents of the shared buffer which can fit in the
|
||||
comm buffer should be read before returning.
|
||||
|
||||
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
|
||||
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
---
|
||||
lib/efi_loader/efi_variable_tee.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
|
||||
index 38655a9dbb7c..67743d1f8fce 100644
|
||||
--- a/lib/efi_loader/efi_variable_tee.c
|
||||
+++ b/lib/efi_loader/efi_variable_tee.c
|
||||
@@ -357,6 +357,7 @@ static efi_status_t __efi_runtime ffa_mm_communicate(void *comm_buf, ulong comm_
|
||||
sizeof(size_t);
|
||||
|
||||
if (rx_data_size > comm_buf_size) {
|
||||
+ efi_memcpy_runtime(comm_buf, virt_shared_buf, comm_buf_size);
|
||||
unmap_sysmem(virt_shared_buf);
|
||||
return EFI_BUFFER_TOO_SMALL;
|
||||
}
|
||||
--
|
||||
2.30.2
|
||||
|
||||
-34
@@ -1,34 +0,0 @@
|
||||
From c0c6e4c1166c4868afc36649b9ed98081a6966e1 Mon Sep 17 00:00:00 2001
|
||||
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
|
||||
Date: Fri, 24 Dec 2021 14:22:52 +0000
|
||||
Subject: [PATCH 24/27] Comment mm_communicate failure log
|
||||
|
||||
When a getVariable() call is made with data size set to 0,
|
||||
mm_communicate should return EFI_BUFFER_TOO_SMALL. This is
|
||||
an expected behavior. There should not be any failure logs
|
||||
in this case. So the error log is commented here.
|
||||
|
||||
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
---
|
||||
lib/efi_loader/efi_variable_tee.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
|
||||
index 67743d1f8fce..a34989efac83 100644
|
||||
--- a/lib/efi_loader/efi_variable_tee.c
|
||||
+++ b/lib/efi_loader/efi_variable_tee.c
|
||||
@@ -411,7 +411,10 @@ static efi_status_t __efi_runtime mm_communicate(u8 *comm_buf, efi_uintn_t dsize
|
||||
ret = ffa_mm_communicate(comm_buf, dsize);
|
||||
#endif
|
||||
if (ret != EFI_SUCCESS) {
|
||||
- log_err("%s failed!\n", __func__);
|
||||
+ /* mm_communicate failure is logged even when getVariable() is called
|
||||
+ * with data size set to 0. This is not expected so logging is commented.
|
||||
+ */
|
||||
+ //log_err("%s failed!\n", __func__);
|
||||
return ret;
|
||||
}
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -36,15 +36,12 @@ SRC_URI:append:corstone1000 = " \
|
||||
file://0016-efi_boottime-corstone1000-pass-interface-id-and-kern.patch \
|
||||
file://0017-efi_loader-corstone1000-remove-guid-check-from-corst.patch \
|
||||
file://0018-arm_ffa-removing-the-cast-when-using-binary-OR-on-FI.patch \
|
||||
file://0019-Return-proper-error-code-when-rx-buffer-is-larger.patch \
|
||||
file://0020-Use-correct-buffer-size.patch \
|
||||
file://0021-Update-comm_buf-when-EFI_BUFFER_TOO_SMALL.patch \
|
||||
file://0022-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch \
|
||||
file://0023-efi_firmware-add-get_image_info-for-corstone1000.patch \
|
||||
file://0024-Comment-mm_communicate-failure-log.patch \
|
||||
file://0025-efi_loader-send-bootcomplete-message-to-secure-encla.patch \
|
||||
file://0026-efi_loader-fix-null-pointer-exception-with-get_image.patch \
|
||||
file://0027-arm-corstone1000-add-mmc-for-fvp.patch \
|
||||
file://0019-Use-correct-buffer-size.patch \
|
||||
file://0020-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch \
|
||||
file://0021-efi_firmware-add-get_image_info-for-corstone1000.patch \
|
||||
file://0022-efi_loader-send-bootcomplete-message-to-secure-encla.patch \
|
||||
file://0023-efi_loader-fix-null-pointer-exception-with-get_image.patch \
|
||||
file://0024-arm-corstone1000-add-mmc-for-fvp.patch \
|
||||
"
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user