Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trace: Correct the relocation handover with buffer overflow

Browse source 
When the early trace buffer overflows it leaves a gap in the trace buffer
between where the actual data finished and where it would have finished if
there were enough buffer space. This results in corrupted output.

Adjust the logic to resolve this and add a message when the buffer
overflows.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-01-15 14:15:50 -07:00 committed by Tom Rini
parent 9dd665ad33
commit 80f91558a1
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/trace.c
View file

@ -360,8 +360,8 @@ int notrace trace_init(void *buff, size_t buff_size)
if (!was_disabled) {
#ifdef CONFIG_TRACE_EARLY
ulong used, count;
char *end;
ulong used;
/*
* Copy over the early trace data if we have it. Disable
@ -370,12 +370,19 @@ int notrace trace_init(void *buff, size_t buff_size)
trace_enabled = 0;
hdr = map_sysmem(CONFIG_TRACE_EARLY_ADDR,
CONFIG_TRACE_EARLY_SIZE);
end = (char *)&hdr->ftrace[min(hdr->ftrace_count,
hdr->ftrace_size)];
count = min(hdr->ftrace_count, hdr->ftrace_size);
end = (char *)&hdr->ftrace[count];
used = end - (char *)hdr;
printf("trace: copying %08lx bytes of early data from %x to %08lx\n",
used, CONFIG_TRACE_EARLY_ADDR,
(ulong)map_to_sysmem(buff));
printf("%lu traced function calls", count);
if (hdr->ftrace_count > hdr->ftrace_size) {
printf(" (%lu dropped due to overflow)",
hdr->ftrace_count - hdr->ftrace_size);
hdr->ftrace_count = hdr->ftrace_size;
}
puts("\n");
memcpy(buff, hdr, used);
#else
puts("trace: already enabled\n");