summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Muellner <christoph.muellner@theobroma-systems.com>2019-08-07 17:02:30 +0200
committerChristoph Muellner <christoph.muellner@theobroma-systems.com>2019-08-07 17:04:29 +0200
commite0c9b00e8143f76caf8c0e519297c09a46017c2a (patch)
tree7ec8dfa61f11b54b4dd3a259686bd3b598eefa25
parent00dd009e86f5c44d2d4a2e00717e06f1287ac301 (diff)
spl: atf: Fix uninitialized pointer to bl31_image_info
The pointer to struct atf_image_info in bl31_params_mem.bl31_params.bl31_image_info is not initialized before being dereferenced. This can cause U-Boot to crash right before jumping to the BL31 ATF binary. Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Fixes: bcc1726a7bdd ("spl: add support to booting with ATF") Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
-rw-r--r--common/spl/spl_atf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index cddab6a735..4715f9d371 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -45,6 +45,7 @@ static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry)
SET_PARAM_HEAD(bl2_to_bl31_params, ATF_PARAM_BL31, ATF_VERSION_1, 0);
/* Fill BL31 related information */
+ bl2_to_bl31_params->bl31_image_info = &bl31_params_mem.bl31_image_info;
SET_PARAM_HEAD(bl2_to_bl31_params->bl31_image_info,
ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0);