From: Andrew F. Davis Date: Thu, 29 Jun 2017 13:38:25 +0000 (-0500) Subject: arm: mach-keystone: Modify secure image size before copy X-Git-Tag: v2017.09-rc1~218 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e58d4dbe361319bd964a760b4f6f0ddfc7b9e7f;p=oweals%2Fu-boot.git arm: mach-keystone: Modify secure image size before copy The size of the secure image does not include the size of the header, subtract this out before we move the image or we grab extra data after the image. Signed-off-by: Andrew F. Davis Reviewed-by: Lokesh Vutla --- diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c index 81009848d0..ebfb483a1b 100644 --- a/arch/arm/mach-keystone/mon.c +++ b/arch/arm/mach-keystone/mon.c @@ -114,12 +114,12 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) } /* - * Overwrite the image headers after authentication - * and decryption. Update size to reflect removal - * of header. - */ - memcpy(image, image + KS2_HS_SEC_HEADER_LEN, *p_size); + * Overwrite the image headers after authentication + * and decryption. Update size to reflect removal + * of header. + */ *p_size -= KS2_HS_SEC_HEADER_LEN; + memcpy(image, image + KS2_HS_SEC_HEADER_LEN, *p_size); /* * Output notification of successful authentication to re-assure the