openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 06:01:16 +02:00
Code Issues Releases Wiki Activity

cbtable.c: Factor out lb_table_validation logic

Browse Source 
Write a pure function for the table validation logic, it is
easier to unit-test.

Change-Id: I07b0f95ec0443fa6a8f54eb93f4a7ea1875cccad
Signed-off-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/37239
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Edward O'Callaghan
2019-11-26 23:31:06 +11:00
parent 4a55e68858
commit 1d80d64587
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cbtable.c
View File

@ -170,6 +170,23 @@ static int lb_header_valid(struct lb_header *head, unsigned long addr)
return 1; 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, static struct lb_header *find_lb_table(void *base, unsigned long start,
unsigned long end) 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)); (struct lb_record *)(((char *)base) + addr + sizeof(*head));
if (!lb_header_valid(head, addr)) if (!lb_header_valid(head, addr))
continue; continue;
if (count_lb_records(head) != head->table_entries) { if (!lb_table_valid(head, recs))
msg_perr("Bad record count: %d.\n",
head->table_entries);
continue; 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); msg_pdbg("Found coreboot table at 0x%08lx.\n", addr);
return head; return head;