Skip to contentSkip to conversation

arm-bsp/tf-m: fix capsule instability issue for

PATCH Applied [email protected] 2 participants 4 messages Jan 17, 2022 – Jan 18, 2022

lore
Share & tools
lore
#0 lore raw

cover arm-bsp/tf-m: fix capsule instability issue for

From: Vishnu Banavath <[email protected]>

This change is to upgrade TF-M to latest git hash which contains fix for capsule instability issue for corstone1000 platform.

Latest TF-M would also require v3.1 mbedtls. Also updated git hash for mbedtls repo.

Vishnu Banavath (2):
arm-bsp/tf-m: fix capsule instability issue for corstone1000 arm-bsp/uboot: fix null pointer exception for get_image_info

 .../trusted-firmware-m-corstone1000.inc       | 10 ++--
 ...ull-pointer-exception-with-get_image.patch | 60 +++++++++++++++++++
 .../recipes-bsp/u-boot/u-boot_%.bbappend      |  1 +
 3 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0052-efi_loader-fix-null-pointer-exception-with-get_image.patch
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 arm-bsp/tf-m: fix capsule instability issue for corstone1000

From: Vishnu Banavath <[email protected]>

This change is to upgrade TF-M to latest git hash which contains fix for capsule instability issue for corstone1000 platform.

Latest TF-M would also require v3.1 mbedtls. Also updated git hash for mbedtls repo.

---
 .../trusted-firmware-m-corstone1000.inc                | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +6 -4
index f37cf33..c0bce14 100644
@@ -9,7 +9,9 @@ TFM_PLATFORM_IS_FVP ?= "FALSE"
 EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}"
 
 SRCBRANCH_tfm = "master"
-SRCREV_tfm = "ca8c634a3dc15b42d41655a14e512b642320893a"
+SRCREV_tfm = "49a28600f9dd640638f667273ef15acb6d1a8e1c"
+SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49"
+SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8"
 
 PV = "1.5.0+git${SRCREV_tfm}"
 SRCREV_FORMAT = "tfm_mcuboot_tfm-tests_mbedtls"
@@ -22,9 +24,9 @@ do_prepare_recipe_sysroot[depends]+= "trusted-firmware-a:do_populate_sysroot"
 require trusted-firmware-m-sign-host-images.inc
 
 do_install() {
-  install -D -p -m 0644 ${B}/install/outputs/ARM/CORSTONE1000/tfm_s_signed.bin ${D}/firmware/tfm_s_signed.bin
-  install -D -p -m 0644 ${B}/install/outputs/ARM/CORSTONE1000/bl2_signed.bin ${D}/firmware/bl2_signed.bin
-  install -D -p -m 0644 ${B}/install/outputs/ARM/CORSTONE1000/bl1.bin ${D}/firmware/bl1.bin
+  install -D -p -m 0644 ${B}/install/outputs/tfm_s_signed.bin ${D}/firmware/tfm_s_signed.bin
+  install -D -p -m 0644 ${B}/install/outputs/bl2_signed.bin ${D}/firmware/bl2_signed.bin
+  install -D -p -m 0644 ${B}/install/outputs/bl1.bin ${D}/firmware/bl1.bin
 
   #
   # Signing TF-A BL2 and the FIP image
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 arm-bsp/uboot: fix null pointer exception for get_image_info

In reply to [email protected]

From: Vishnu Banavath <[email protected]>

This change is to fix NULL pointer exception for get_image_info API for corstone1000 platform

---
 ...ull-pointer-exception-with-get_image.patch | 60 +++++++++++++++++++
 .../recipes-bsp/u-boot/u-boot_%.bbappend      |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0052-efi_loader-fix-null-pointer-exception-with-get_image.patch
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0052-efi_loader-fix-null-pointer-exception-with-get_image.patch new file +60 -0
new file mode 100644
index 0000000..2376418
@@ -0,0 +1,60 @@
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+From f4d3fcdd4ba747a0fd6875f9626c06ad01b889c7 Mon Sep 17 00:00:00 2001
+From: Vishnu Banavath <[email protected]>
+Date: Fri, 14 Jan 2022 15:24:18 +0000
+Subject: [PATCH] efi_loader: fix null pointer exception with get_image_info
+
+get_img_info API implemented for corstone1000 target does not
+check the input attributes and as a result uboot crash's with
+null pointer access. This change is to fix the null pointer
+exception.
+
+Signed-off-by: Vishnu Banavath <[email protected]>
+
+diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c
+index a7f7598eab..d5f4788c8f 100644
+--- a/lib/efi_loader/efi_firmware.c
++++ b/lib/efi_loader/efi_firmware.c
+@@ -344,26 +344,29 @@ static efi_status_t efi_corstone1000_img_info_get (
+ 	int i = 0;
+ 
+ 	*image_info_size = sizeof(*image_info);
+-	*descriptor_version = EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION;
+-	*descriptor_count = 1;//dfu_num;
+-	*descriptor_size = sizeof(*image_info);
++	if(descriptor_version)
++	    *descriptor_version = EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION;
++	if(descriptor_count)
++	    *descriptor_count = 1;
++	if(descriptor_size)
++	    *descriptor_size = sizeof(*image_info);
+ 	if (package_version)
+ 		*package_version = 0xffffffff; /* not supported */
+ 	if(package_version_name)
+ 		*package_version_name = NULL; /* not supported */
+ 
+ 	if(image_info == NULL) {
+-		log_info("image_info is null\n");
++		log_debug("image_info is null\n");
+ 		return EFI_BUFFER_TOO_SMALL;
+ 	}
+ 
+-	image_info[i].image_index = i;
++	image_info[i].image_index = 1;
+ 	image_info[i].image_type_id = *image_type;
+ 	image_info[i].image_id = 0;
+-	image_info[i].image_id_name = "wic";
+-	image_info[i].version = 1;
++	image_info[i].image_id_name = L"wic image";
++	image_info[i].version = 0;
+ 	image_info[i].version_name = NULL;
+-	image_info[i].size = 0x1000;
++	image_info[i].size = 0;
+ 	image_info[i].attributes_supported = IMAGE_ATTRIBUTE_IMAGE_UPDATABLE |
+ 					     IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED;
+ 	image_info[i].attributes_setting = IMAGE_ATTRIBUTE_IMAGE_UPDATABLE;
+-- 
+2.17.1
+
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +1 -0
index 08aacf6..5a927ba 100644
@@ -61,6 +61,7 @@ SRC_URI:append:corstone1000 = " \
       file://0049-efi_loader-Fix-loaded-image-alignment.patch \
       file://0050-Comment-mm_communicate-failure-log.patch \
       file://0051-efi_loader-send-bootcomplete-message-to-secure-encla.patch \
+      file://0052-efi_loader-fix-null-pointer-exception-with-get_image.patch \
       "
 
 #
Signature · 1 line
2.17.1
Applied
#3 lore raw
In reply to [email protected]
Quoted 11 lines · On Mon, 17 Jan 2022 18:20:05 +0000, [email protected] wrote:

This change is to upgrade TF-M to latest git hash which contains fix for capsule instability issue for corstone1000 platform.

Latest TF-M would also require v3.1 mbedtls. Also updated git hash for mbedtls repo.

Vishnu Banavath (2):
arm-bsp/tf-m: fix capsule instability issue for corstone1000 arm-bsp/uboot: fix null pointer exception for get_image_info

[...]

Applied, thanks!

[1/2] arm-bsp/tf-m: fix capsule instability issue for corstone1000

      commit: c30d90a77d78279eb07549bdada011e960328c46
[2/2] arm-bsp/uboot: fix null pointer exception for get_image_info
      commit: e15df2738e41e22b653f0f55c3e76ffc076a98f9

Best regards,

Signature · 1 line
Jon Mason <[email protected]>