imx: hab: Ensure the IVT DCD pointer is Null prior to calling HAB authenticate function.

DCD commands should only be present in the initial boot image loaded by
the SoC ROM. DCD should not be present in images that will be verified
by software using HAB RVT authentication APIs. Newer versions of HAB
will generate an error if a DCD pointer is present in an image being
authenticated by calling the HAB RVT API. Older versions of HAB will
process and run DCD if it is present, and this could lead to an incorrect
authentication boot flow.

It is highly recommended this check is in place to ensure additional HAB
verified images do not include a DCD table.

Signed-off-by: Utkarsh Gupta <utkarsh.gupta@nxp.com>
Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 1e6b31da7a0d773c5fbfe8405c1e44cb7241068c..ba6b31d49070a3eb19416a68c7712d95529e5f81 100644 (file)
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -516,6 +516,12 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size,
                goto hab_authentication_exit;
        }
 
+       /* Verify if IVT DCD pointer is NULL */
+       if (ivt->dcd) {
+               puts("Error: DCD pointer must be NULL\n");
+               goto hab_authentication_exit;
+       }
+
        start = ddr_start;
        bytes = image_size;