From 0bf8eb4caa72f353b5590d72016f242b2a5b5ceb Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Sat, 11 Dec 2021 10:02:24 +0000 Subject: [PATCH] arm-bsp/u-boot: corstone1000: Fix GetVariable data size issue This patch fixes the GetVariable() issue which causes mm_communicate failure when called with 0 data size. The comm buffer is set to maximum size when 0 data size request is made to handle the MM response from the secure world. This is a generic fix but used by corstone1000. Change-Id: Id50619816a924b4fa7597295f89d54827191fbb5 Signed-off-by: Gowtham Suresh Kumar Signed-off-by: Jon Mason --- ...ix-GetVariable-to-handle-0-data-size.patch | 47 +++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-Fix-GetVariable-to-handle-0-data-size.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-Fix-GetVariable-to-handle-0-data-size.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-Fix-GetVariable-to-handle-0-data-size.patch new file mode 100644 index 00000000..7b678579 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-Fix-GetVariable-to-handle-0-data-size.patch @@ -0,0 +1,47 @@ +Upstream-Status: Pending [Not submitted to upstream yet] +Signed-off-by: Gowtham Suresh Kumar + +From ff2b492bf68337d6cdd296ed61f91304b2da3143 Mon Sep 17 00:00:00 2001 +From: Gowtham Suresh Kumar +Date: Tue, 7 Dec 2021 00:26:37 +0000 +Subject: [PATCH] Fix GetVariable() to handle 0 data size + +This patch fixes the GetVariable() issue which causes +mm_communicate failure when called with 0 data size. The comm buffer +is set to maximum size when 0 data size request is made to handle the +MM response from the secure world. This is a generic fix but used by +corstone1000. + +Signed-off-by: Gowtham Suresh Kumar + +%% original patch: 0035-corstone1000-Add-support-in-GetVariable-to-handle-re.patch +--- + lib/efi_loader/efi_variable_tee.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c +index 9375aa6a63..b7de80cd39 100644 +--- a/lib/efi_loader/efi_variable_tee.c ++++ b/lib/efi_loader/efi_variable_tee.c +@@ -637,10 +637,15 @@ efi_status_t efi_get_variable_int(u16 *variable_name, const efi_guid_t *vendor, + goto out; + } + +- /* Trim output buffer size */ ++ /* Set output buffer size to maximum value if data_size is ++ * larger than the supported value or if efi_get_variable_int() ++ * is called with data_size set to 0. In the latter case if ++ * output buffer is not set to maximum, the comm_buf will be ++ * smaller than the MM response. ++ */ + tmp_dsize = *data_size; +- if (name_size + tmp_dsize > +- max_payload_size - MM_VARIABLE_ACCESS_HEADER_SIZE) { ++ if ((name_size + tmp_dsize > max_payload_size - MM_VARIABLE_ACCESS_HEADER_SIZE) ++ || (!tmp_dsize)) { + tmp_dsize = max_payload_size - + MM_VARIABLE_ACCESS_HEADER_SIZE - + name_size; +-- +2.17.1 + diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index bc53c7e7..fd5184ef 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -44,6 +44,7 @@ SRC_URI:append:corstone1000 = " \ file://0032-arm-corstone1000-identify-which-bank-to-load-kernel.patch \ file://0033-corstone1000-dts-setting-the-boot-console-output.patch \ file://0034-corstone1000-dts-remove-the-use-of-fdt_addr_r.patch \ + file://0035-Fix-GetVariable-to-handle-0-data-size.patch \ " #