[U-Boot] [PATCH] arm: mach-keystone: Modify secure image size before copy

[U-Boot] [PATCH] arm: mach-keystone: Modify secure image size before copy

[Andrew F. Davis]

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 <afd@ti.com>
---
 arch/arm/mach-keystone/mon.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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
-- 
2.13.0

[U-Boot] [PATCH] arm: mach-keystone: Modify secure image size before copy

[Lokesh Vutla]

On Thursday 29 June 2017 07:08 PM, Andrew F. Davis wrote:
> 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 <afd@ti.com>

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

Thanks and regards,
Lokesh

[U-Boot] arm: mach-keystone: Modify secure image size before copy

[Tom Rini]

On Thu, Jun 29, 2017 at 08:38:25AM -0500, Andrew F. Davis wrote:

> 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 <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: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170711/c5e71e69/attachment.sig>