From 3cc6e7070dea2c81ef8f052740e9a9cc791c57f4 Mon Sep 17 00:00:00 2001
From: Jonathan Golder <jonathan.golder@kurz-elektronik.de>
Date: Fri, 24 Feb 2017 17:46:10 +0100
Subject: [PATCH] splash: Prevent splash_load_fs from writing to 0x0
Passing NULL to fs_read() for actread value results in hanging U-Boot
at least on our ARM plattform (TI AM335x). Since fs_read() and
following functions do not catch nullpointers, writing to 0x0 occurs.
Passing a local dummy var instead of NULL solves this issue.
Signed-off-by: Jonathan Golder <jonathan.golder@kurz-elektronik.de>
Cc: Anatolij Gustschin <agust@denx.de>
---
common/splash_source.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/splash_source.c b/common/splash_source.c
index a5eeb3f12c5..d1647c83006 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -216,6 +216,7 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
{
int res = 0;
loff_t bmp_size;
+ loff_t actread;
char *splash_file;
splash_file = getenv("splashfile");
@@ -251,7 +252,7 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
}
splash_select_fs_dev(location);
- res = fs_read(splash_file, bmp_load_addr, 0, 0, NULL);
+ res = fs_read(splash_file, bmp_load_addr, 0, 0, &actread);
out:
if (location->ubivol != NULL)
--
GitLab