Am Freitag, dem 19.04.2024 um 08:55 -0700 schrieb Daniel Schultz:
> From: Yannic Moog <y.m...@phytec.de>
>
> For all of the functions that access the eeprom_data, make sure these
> data are valid. Use the valid member of the phytec_eeprom_data
> struct.
> This fixes a bug where only the API revision check guarded against
> accessing rubbish. But if API revision was e.g. 6, eeprom setup
> failed
> before, but phytec_get_imx8m_eth would still happily access the data.
>
> Fixes: dc22188cdc8 ("board: phytec: Add common PHYTEC SoM detection")
>
> Signed-off-by: Yannic Moog <y.m...@phytec.de>
> Signed-off-by: Daniel Schultz <d.schu...@phytec.de>
Reviewed-by: Teresa Remmet <t.rem...@phytec.de>
> ---
> board/phytec/common/imx8m_som_detection.c | 11 +++++++----
> board/phytec/common/phytec_som_detection.c | 10 +++++++---
> 2 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/board/phytec/common/imx8m_som_detection.c
> b/board/phytec/common/imx8m_som_detection.c
> index 7571076a09e..ee34a5b9579 100644
> --- a/board/phytec/common/imx8m_som_detection.c
> +++ b/board/phytec/common/imx8m_som_detection.c
> @@ -34,7 +34,7 @@ int __maybe_unused phytec_imx8m_detect(struct
> phytec_eeprom_data *data)
> data = &eeprom_data;
>
> /* We can not do the check for early API revisions */
> - if (data->payload.api_rev < PHYTEC_API_REV2)
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> return -1;
>
> som = data->payload.data.data_api2.som_no;
> @@ -75,6 +75,9 @@ u8 __maybe_unused phytec_get_imx8m_ddr_size(struct
> phytec_eeprom_data *data)
> if (!data)
> data = &eeprom_data;
>
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> + return PHYTEC_EEPROM_INVAL;
> +
> opt = phytec_get_opt(data);
> if (opt)
> ddr_id = PHYTEC_GET_OPTION(opt[2]);
> @@ -99,7 +102,7 @@ u8 __maybe_unused phytec_get_imx8m_spi(struct
> phytec_eeprom_data *data)
> if (!data)
> data = &eeprom_data;
>
> - if (data->payload.api_rev < PHYTEC_API_REV2)
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> return PHYTEC_EEPROM_INVAL;
>
> opt = phytec_get_opt(data);
> @@ -126,7 +129,7 @@ u8 __maybe_unused phytec_get_imx8m_eth(struct
> phytec_eeprom_data *data)
> if (!data)
> data = &eeprom_data;
>
> - if (data->payload.api_rev < PHYTEC_API_REV2)
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> return PHYTEC_EEPROM_INVAL;
>
> opt = phytec_get_opt(data);
> @@ -154,7 +157,7 @@ u8 __maybe_unused phytec_get_imx8mp_rtc(struct
> phytec_eeprom_data *data)
> if (!data)
> data = &eeprom_data;
>
> - if (data->payload.api_rev < PHYTEC_API_REV2)
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> return PHYTEC_EEPROM_INVAL;
>
> opt = phytec_get_opt(data);
> diff --git a/board/phytec/common/phytec_som_detection.c
> b/board/phytec/common/phytec_som_detection.c
> index 7913764be0a..5a4cc9e8b02 100644
> --- a/board/phytec/common/phytec_som_detection.c
> +++ b/board/phytec/common/phytec_som_detection.c
> @@ -128,7 +128,7 @@ void __maybe_unused phytec_print_som_info(struct
> phytec_eeprom_data *data)
> if (!data)
> data = &eeprom_data;
>
> - if (data->payload.api_rev < PHYTEC_API_REV2)
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> return;
>
> api2 = &data->payload.data.data_api2;
> @@ -190,6 +190,9 @@ char * __maybe_unused phytec_get_opt(struct
> phytec_eeprom_data *data)
> if (!data)
> data = &eeprom_data;
>
> + if (!data->valid)
> + return NULL;
> +
> if (data->payload.api_rev < PHYTEC_API_REV2)
> opt = data->payload.data.data_api0.opt;
> else
> @@ -205,7 +208,7 @@ u8 __maybe_unused phytec_get_rev(struct
> phytec_eeprom_data *data)
> if (!data)
> data = &eeprom_data;
>
> - if (data->payload.api_rev < PHYTEC_API_REV2)
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> return PHYTEC_EEPROM_INVAL;
>
> api2 = &data->payload.data.data_api2;
> @@ -217,7 +220,8 @@ u8 __maybe_unused phytec_get_som_type(struct
> phytec_eeprom_data *data)
> {
> if (!data)
> data = &eeprom_data;
> - if (data->payload.api_rev < PHYTEC_API_REV2)
> +
> + if (!data->valid || data->payload.api_rev < PHYTEC_API_REV2)
> return PHYTEC_EEPROM_INVAL;
>
> return data->payload.data.data_api2.som_type;
--
PHYTEC Messtechnik GmbH | Barcelona-Allee 1 | 55129 Mainz, Germany
Geschäftsführer: Dipl.-Ing. Michael Mitezki, Dipl.-Ing. Bodo Huber,
Dipl.-Ing. (FH) Markus Lickes | Handelsregister Mainz HRB 4656 |
Finanzamt Mainz | St.Nr. 266500608, DE 149059855
