GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: cbmem_console: Drop loglevel markers from snapshot 

coreboot recently introduced non-printable loglevel markers in the CBMEM
console. Payloads were generally unaffected since they don't use log
levels and it is still legal to append lines without a marker to the
log. However, payloads using cbmem_console_snapshot() to display
existing logs from coreboot have started seeing '?' characters in place
of the markers. This patch fixes the issue by filtering out marker
characters.

BUG=b:221909874

Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: I4a9e5d464508320cf43ea572d62896d38c2a128d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62506
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Julius Werner 2022-03-01 17:53:40 -08:00 committed by Raul Rangel
parent 872c34a57f
commit 2c423441c0
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
payloads/libpayload/drivers/cbmem_console.c
View File

@ -80,11 +80,28 @@ void cbmem_console_write(const void *buffer, size_t count)
do_write(buffer, count); do_write(buffer, count);
} }
static void snapshot_putc(char *console, uint32_t *cursor, char c)
{
/* This is BIOS_LOG_IS_MARKER() from coreboot. Due to stupid
licensing restrictions, we can't use it directly. */
if (c >= 0x10 && c <= 0x18)
return;
/* Slight memory corruption may occur between reboots and give us a few
unprintable characters like '\0'. Replace them with '?' on output. */
if (!isprint(c) && !isspace(c))
console[*cursor] = '?';
else
console[*cursor] = c;
*cursor += 1;
}
char *cbmem_console_snapshot(void) char *cbmem_console_snapshot(void)
{ {
const struct cbmem_console *const console_p = phys_to_virt(cbmem_console_p); const struct cbmem_console *const console_p = phys_to_virt(cbmem_console_p);
char *console_c; char *console_c;
uint32_t size, cursor, overflow; uint32_t size, cursor, overflow, newc, oldc;
if (!console_p) { if (!console_p) {
printf("ERROR: No cbmem console found in coreboot table\n"); printf("ERROR: No cbmem console found in coreboot table\n");
@ -104,24 +121,19 @@ char *cbmem_console_snapshot(void)
size); size);
return NULL; return NULL;
} }
console_c[size] = '\0';
newc = 0;
if (overflow) { if (overflow) {
if (cursor >= size) { if (cursor >= size) {
printf("ERROR: CBMEM console struct is corrupted\n"); printf("ERROR: CBMEM console struct is corrupted\n");
return NULL; return NULL;
} }
memcpy(console_c, console_p->body + cursor, size - cursor); for (oldc = cursor; oldc < size; oldc++)
memcpy(console_c + size - cursor, console_p->body, cursor); snapshot_putc(console_c, &newc, console_p->body[oldc]);
} else {
memcpy(console_c, console_p->body, size);
} }
for (oldc = 0; oldc < size && oldc < cursor; oldc++)
/* Slight memory corruption may occur between reboots and give us a few snapshot_putc(console_c, &newc, console_p->body[oldc]);
unprintable characters like '\0'. Replace them with '?' on output. */ console_c[newc] = '\0';
for (cursor = 0; cursor < size; cursor++)
if (!isprint(console_c[cursor]) && !isspace(console_c[cursor]))
console_c[cursor] = '?';
return console_c; return console_c;
} }