At present there is a single shared address for bootstage data in both TPL and SPL. If SPL unstashs TPL bootstage info and then stashes it again to pass it to U-Boot, the new stash overwrites the strings of the old stash.
Fix this by duplicating the strings into the malloc() region. This should be a small cost in terms of space. Fix the header-file order at the same time.
This problem doesn't happen at the next stage (SPL->U-Boot) since U-Boot relocates the boostage data.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/bootstage.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/common/bootstage.c b/common/bootstage.c index fe36bac0474..4557ed4508c 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -10,9 +10,10 @@ */
#include <common.h> -#include <linux/libfdt.h> #include <malloc.h> +#include <spl.h> #include <linux/compiler.h> +#include <linux/libfdt.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -472,6 +473,8 @@ int bootstage_unstash(const void *base, int size) for (rec = data->record + data->next_id, i = 0; i < hdr->count; i++, rec++) { rec->name = ptr; + if (spl_phase() == PHASE_SPL) + rec->name = strdup(ptr);
/* Assume no data corruption here */ ptr += strlen(ptr) + 1;