From c7ab404fc1afd1420cd8574ee05fcbff0a7e9e0c Mon Sep 17 00:00:00 2001 From: CTCaer Date: Tue, 5 May 2020 18:58:53 +0300 Subject: [PATCH] exo: Fix prodinfo blanking overriding --- bootloader/hos/hos_config.c | 4 ++-- bootloader/hos/secmon_exo.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootloader/hos/hos_config.c b/bootloader/hos/hos_config.c index 4c3d789..190ef5f 100644 --- a/bootloader/hos/hos_config.c +++ b/bootloader/hos/hos_config.c @@ -223,7 +223,7 @@ static int _config_exo_user_pmu_access(launch_ctxt_t *ctxt, const char *value) static int _config_exo_cal0_blanking(launch_ctxt_t *ctxt, const char *value) { // Override key found. - ctxt->exo_cfg.cal0_blank = calloc(1, 1); + ctxt->exo_cfg.cal0_blank = calloc(sizeof(bool), 1); if (*value == '1') { @@ -236,7 +236,7 @@ static int _config_exo_cal0_blanking(launch_ctxt_t *ctxt, const char *value) static int _config_exo_cal0_writes_enable(launch_ctxt_t *ctxt, const char *value) { // Override key found. - ctxt->exo_cfg.cal0_allow_writes_sys = calloc(1, 1); + ctxt->exo_cfg.cal0_allow_writes_sys = calloc(sizeof(bool), 1); if (*value == '1') { diff --git a/bootloader/hos/secmon_exo.c b/bootloader/hos/secmon_exo.c index 60e062b..ab84264 100644 --- a/bootloader/hos/secmon_exo.c +++ b/bootloader/hos/secmon_exo.c @@ -221,12 +221,12 @@ void config_exosphere(launch_ctxt_t *ctxt) if (ctxt->exo_cfg.user_pmu) exoFlags |= EXO_FLAG_USER_PMU; - // Check if exo ini value is overridden and enable prodinfo blanking. + // Enable prodinfo blanking. Check if exo ini value is overridden. If not, check if enabled in exo ini. if ((ctxt->exo_cfg.cal0_blank && *ctxt->exo_cfg.cal0_blank) || (!ctxt->exo_cfg.cal0_blank && cal0_blanking)) exoFlags |= EXO_FLAG_CAL0_BLANKING; - // Check if exo ini value is overridden and allow prodinfo writes. + // Allow prodinfo writes. Check if exo ini value is overridden. If not, check if enabled in exo ini. if ((ctxt->exo_cfg.cal0_allow_writes_sys && *ctxt->exo_cfg.cal0_allow_writes_sys) || (!ctxt->exo_cfg.cal0_allow_writes_sys && cal0_allow_writes_sys)) exoFlags |= EXO_FLAG_CAL0_WRITES_SYS;