aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorFrieder Schrempf <frieder.schrempf@kontron.de>2019-06-27 07:03:16 +0000
committerKever Yang <kever.yang@rock-chips.com>2019-07-02 10:30:02 +0800
commita239b82dad03ad942aaf5fbbda672e882968488c (patch)
treed04ab42a877e7ea02b518d8776a02920e4370347 /common
parent8c2d42d526574a6d972d7711660b652d2aeba7e1 (diff)
downloadu-boot-a239b82dad03ad942aaf5fbbda672e882968488c.zip
u-boot-a239b82dad03ad942aaf5fbbda672e882968488c.tar.gz
u-boot-a239b82dad03ad942aaf5fbbda672e882968488c.tar.bz2
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") Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'common')
-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 cddab6a..4715f9d3 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);