[U-Boot] [PATCH] arm: am33xx: security: Fix size calculation on header

[U-Boot] [PATCH] arm: am33xx: security: Fix size calculation on header

[Andrew F. Davis]

From: Madan Srinivas <madans@ti.com>

Fix the size calculation in the verify boot. The header size
should be subtracted from the image size, not be assigned to
the image size.

Fixes: 0830d72bb9f8 ("arm: am33xx: security: adds auth support for encrypted images")
Signed-off-by: Madan Srinivas <madans@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 arch/arm/mach-omap2/sec-common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 2630e7d316..674517e30b 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -130,7 +130,7 @@ int secure_boot_verify_image(void **image, size_t *size)
 	*size = sig_addr - cert_addr;	/* Subtract out the signature size */
 	/* Subtract header if present */
 	if (strncmp((char *)sig_addr, "CERT_ISW_", 9) == 0)
-		*size = ((u32 *)*image)[HEADER_SIZE_OFFSET];
+		*size -= ((u32 *)*image)[HEADER_SIZE_OFFSET];
 	cert_size = *size;
 
 	/* Check if image load address is 32-bit aligned */
-- 
2.15.1

[U-Boot] [PATCH] arm: am33xx: security: Fix size calculation on header

[Lokesh Vutla]

On Wednesday 10 January 2018 02:02 AM, Andrew F. Davis wrote:
> From: Madan Srinivas <madans@ti.com>
> 
> Fix the size calculation in the verify boot. The header size
> should be subtracted from the image size, not be assigned to
> the image size.

Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks and regards,
Lokesh

[U-Boot] arm: am33xx: security: Fix size calculation on header

[Tom Rini]

On Tue, Jan 09, 2018 at 02:32:41PM -0600, Andrew F. Davis wrote:

> From: Madan Srinivas <madans@ti.com>
> 
> Fix the size calculation in the verify boot. The header size
> should be subtracted from the image size, not be assigned to
> the image size.
> 
> Fixes: 0830d72bb9f8 ("arm: am33xx: security: adds auth support for encrypted images")
> Signed-off-by: Madan Srinivas <madans@ti.com>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180119/493f03ee/attachment.sig>