From 1d80d645875cde4aa1ea17bd1d166619bed09682 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Tue, 26 Nov 2019 23:31:06 +1100 Subject: cbtable.c: Factor out lb_table_validation logic Write a pure function for the table validation logic, it is easier to unit-test. Change-Id: I07b0f95ec0443fa6a8f54eb93f4a7ea1875cccad Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/37239 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- cbtable.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/cbtable.c b/cbtable.c index 669a4619d..e5668404d 100644 --- a/cbtable.c +++ b/cbtable.c @@ -170,6 +170,23 @@ static int lb_header_valid(struct lb_header *head, unsigned long addr) return 1; } +static int lb_table_valid(struct lb_header *head, struct lb_record *recs) +{ + if (compute_checksum(recs, head->table_bytes) + != head->table_checksum) { + msg_perr("Bad table checksum: %04x.\n", + head->table_checksum); + return 0; + } + if (count_lb_records(head) != head->table_entries) { + msg_perr("Bad record count: %d.\n", + head->table_entries); + return 0; + } + + return 1; +} + static struct lb_header *find_lb_table(void *base, unsigned long start, unsigned long end) { @@ -183,17 +200,8 @@ static struct lb_header *find_lb_table(void *base, unsigned long start, (struct lb_record *)(((char *)base) + addr + sizeof(*head)); if (!lb_header_valid(head, addr)) continue; - if (count_lb_records(head) != head->table_entries) { - msg_perr("Bad record count: %d.\n", - head->table_entries); + if (!lb_table_valid(head, recs)) continue; - } - if (compute_checksum(recs, head->table_bytes) - != head->table_checksum) { - msg_perr("Bad table checksum: %04x.\n", - head->table_checksum); - continue; - } msg_pdbg("Found coreboot table at 0x%08lx.\n", addr); return head; -- cgit v1.2.3