From 8120cb41667c1ec0547904d41bd0841f96aa28bd Mon Sep 17 00:00:00 2001 From: Konrad Adamczyk Date: Mon, 24 Apr 2023 10:06:30 +0000 Subject: [PATCH] util/cbmem: Add REG_NEWLINE flag to fix matching pattern Match-any-character operators (eg. ".*") shall not match newline characters for BANNER_REGEX, since given regular expression matches newline explicitly. Add REG_NEWLINE flag to `regcomp` call. BUG=b:278718871 TEST=Boot firmware on skyrim, reboot. Run `cbmem -2`. `cbmem -2` returns second-to-last boot log. Change-Id: I9e924349ead0fa7eea8b9ad5161138a4c4946ade Signed-off-by: Konrad Adamczyk Reviewed-on: https://review.coreboot.org/c/coreboot/+/74742 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel Reviewed-by: Julius Werner --- 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 c0b39ea6d0..060f88c3f4 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -1001,7 +1001,7 @@ static void dump_console(enum console_print_type type, int max_loglevel, int pri for (size_t i = 0; !cursor && i < ARRAY_SIZE(regex); i++) { regex_t re; regmatch_t match; - int res = regcomp(&re, regex[i], REG_EXTENDED); + int res = regcomp(&re, regex[i], REG_EXTENDED | REG_NEWLINE); assert(res == 0); /* Keep looking for matches so we find the last one. */