board: phytec: check eeprom_data validity

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.moog@phytec.de>
Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Reviewed-by: Teresa Remmet <t.remmet@phytec.de>

diff --git a/board/phytec/common/imx8m_som_detection.c b/board/phytec/common/imx8m_som_detection.c
index 7571076a09ed76673f2b02480efea7fecd840e27..ee34a5b95791d39f645010de6e30ee92120c7248 100644 (file)
--- 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 7913764be0a66a0c950dfbf71ef8f8ac3278e6a4..5a4cc9e8b022a8d795a58e5aad0e7dc1b67641d9 100644 (file)
--- 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;