From be0538f654935ea3986d5cc950bb4092a938111f Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Tue, 20 Sep 2022 14:22:48 +1000 Subject: layout.c: Validate _layout_entry_by_name() arguments before use It may be the case that a layout could not be derived which would result in layout logic being fed a NULL pointer. Validate this case and be defensive to validate the name argument as well. BUG=b:247055486 TEST=builds Change-Id: I2a19c0e586f8575b8b3c2c02b5afad312efacfc9 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/67722 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Felix Singer --- layout.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'layout.c') diff --git a/layout.c b/layout.c index 5916d66f5..0212699ab 100644 --- a/layout.c +++ b/layout.c @@ -58,6 +58,8 @@ static struct romentry *_layout_entry_by_name( const struct flashrom_layout *const layout, const char *name) { struct romentry *entry = NULL; + if (!layout || !name) + return NULL; while ((entry = mutable_layout_next(layout, entry))) { if (!strcmp(entry->name, name)) return entry; -- cgit v1.2.3