From a1d1941d62453658c48912d805c9e6b2e3dc2602 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 12 Jun 2017 17:35:15 -0700 Subject: [PATCH] UPSTREAM: cbmem: Escape literal asterisks in log banner regex I had a stupid. :( Asterisks have a special meaning in regexes, but I just wanted to match three literal ones. This kills the regex parser. BUG=chromium:729621 Change-Id: Ia6149e72715d651c914583ed3235680ce5b7a2e0 Signed-off-by: Julius Werner Original-Reviewed-on: https://review.coreboot.org/20171 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Philippe Mathieu-Daud Reviewed-on: https://chromium-review.googlesource.com/537138 --- util/cbmem/cbmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index daa7b566ca..4c1fa0e0d9 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -670,7 +670,7 @@ static void dump_console(int one_boot_only) cursor = 0; if (one_boot_only) { #define BANNER_REGEX(stage) "\n\ncoreboot-[^\n]* " stage " starting\\.\\.\\.\n" -#define OVERFLOW_REGEX(stage) "\n*** Pre-CBMEM " stage " console overflowed" +#define OVERFLOW_REGEX(stage) "\n\\*\\*\\* Pre-CBMEM " stage " console overflow" const char *regex[] = { BANNER_REGEX("bootblock"), BANNER_REGEX("romstage"), OVERFLOW_REGEX("romstage"),