Skip to content
Snippets Groups Projects
Commit 3cc6e707 authored by Jonathan Golder's avatar Jonathan Golder Committed by Anatolij Gustschin
Browse files

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: default avatarJonathan Golder <jonathan.golder@kurz-elektronik.de>
Cc: Anatolij Gustschin <agust@denx.de>
parent a0f3e3df
No related branches found
No related tags found
No related merge requests found
...@@ -216,6 +216,7 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr) ...@@ -216,6 +216,7 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
{ {
int res = 0; int res = 0;
loff_t bmp_size; loff_t bmp_size;
loff_t actread;
char *splash_file; char *splash_file;
splash_file = getenv("splashfile"); splash_file = getenv("splashfile");
...@@ -251,7 +252,7 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr) ...@@ -251,7 +252,7 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
} }
splash_select_fs_dev(location); 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: out:
if (location->ubivol != NULL) if (location->ubivol != NULL)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment