public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] splash_source: Verify FIT magic
@ 2017-08-03  6:53 Tomas Melin
  2017-08-28 22:22 ` Anatolij Gustschin
  0 siblings, 1 reply; 2+ messages in thread
From: Tomas Melin @ 2017-08-03  6:53 UTC (permalink / raw)
  To: u-boot

From: Niko Mauno <niko.mauno@vaisala.com>

Before reading entire FIT image, add sanity check by testing image
header against FDT_MAGIC. This should help avoid problems in situations
where FIT is not yet available from storage device, for example when
performing initial programming of device.

Cc: Anatolij Gustschin <agust@denx.de>
Acked-by: Tomas Melin <tomas.melin@vaisala.com>
---
 common/splash_source.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/splash_source.c b/common/splash_source.c
index 867a798..30e6a0d 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -317,6 +317,11 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
 		return res;
 
 	img_header = (struct image_header *)bmp_load_addr;
+	if (image_get_magic(img_header) != FDT_MAGIC) {
+		printf("Could not find FDT magic\n");
+		return -EINVAL;
+	}
+
 	fit_size = fdt_totalsize(img_header);
 
 	/* Read in entire FIT */
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] splash_source: Verify FIT magic
  2017-08-03  6:53 [U-Boot] [PATCH] splash_source: Verify FIT magic Tomas Melin
@ 2017-08-28 22:22 ` Anatolij Gustschin
  0 siblings, 0 replies; 2+ messages in thread
From: Anatolij Gustschin @ 2017-08-28 22:22 UTC (permalink / raw)
  To: u-boot

On Thu,  3 Aug 2017 09:53:24 +0300
Tomas Melin tomas.melin at vaisala.com wrote:

> From: Niko Mauno <niko.mauno@vaisala.com>
> 
> Before reading entire FIT image, add sanity check by testing image
> header against FDT_MAGIC. This should help avoid problems in situations
> where FIT is not yet available from storage device, for example when
> performing initial programming of device.
> 
> Cc: Anatolij Gustschin <agust@denx.de>
> Acked-by: Tomas Melin <tomas.melin@vaisala.com>
> ---
>  common/splash_source.c | 5 +++++
>  1 file changed, 5 insertions(+)

Applied to u-boot-video/master, thanks!

--
Anatolij

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-08-28 22:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-03  6:53 [U-Boot] [PATCH] splash_source: Verify FIT magic Tomas Melin
2017-08-28 22:22 ` Anatolij Gustschin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox