imx: image-container: Fix container header checking

Checking container header tag and version is wrong, it causes to fail
to bypass invalid container

Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-imx/image-container.c
index 5b059a64292ec9062d01566b6290cd324d40a2b5..745de130630f10f6718ca0bc031bb8d7db251c5b 100644 (file)
--- a/arch/arm/mach-imx/image-container.c
+++ b/arch/arm/mach-imx/image-container.c
@@ -31,7 +31,7 @@ int get_container_size(ulong addr, u16 *header_length)
        u32 max_offset = 0, img_end;
 
        phdr = (struct container_hdr *)addr;
-       if (phdr->tag != 0x87 && phdr->version != 0x0) {
+       if (phdr->tag != 0x87 || phdr->version != 0x0) {
                debug("Wrong container header\n");
                return -EFAULT;
        }