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

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 <konrada@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74742
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Konrad Adamczyk 2023-04-24 10:06:30 +00:00 committed by Julius Werner
parent 6b6872bdd5
commit 8120cb4166
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/cbmem/cbmem.c
View File

@ -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++) { for (size_t i = 0; !cursor && i < ARRAY_SIZE(regex); i++) {
regex_t re; regex_t re;
regmatch_t match; regmatch_t match;
int res = regcomp(&re, regex[i], REG_EXTENDED); int res = regcomp(&re, regex[i], REG_EXTENDED | REG_NEWLINE);
assert(res == 0); assert(res == 0);
/* Keep looking for matches so we find the last one. */ /* Keep looking for matches so we find the last one. */