From 4eef651ff503f81b778e5af0ed78354e0dec0dd7 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Wed, 3 Feb 2021 11:19:41 +1100 Subject: programmer.h: Convert anon union to anon struct Convert the anon union of registered masters in the mst field of the flashctx to a anon struct. If we are going to dereference a pointer there in an undefined way we should crash and not plow ahead with invalid memory. The user of the registered_masters type is therefore responsible for querying the buses_supported field before attempting to dereference a ptr field in the anon struct. BUG=b:175849641 TEST=`flashrom -p internal --flash-name` Change-Id: I576967a8599b923c902e39f177f39146291cc242 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/50246 Reviewed-by: Anastasia Klimchuk Reviewed-by: Peter Marheine Reviewed-by: Daniel Campello Reviewed-by: Sam McNally Tested-by: build bot (Jenkins) --- opaque.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'opaque.c') diff --git a/opaque.c b/opaque.c index 276934fd1..e3103c891 100644 --- a/opaque.c +++ b/opaque.c @@ -48,7 +48,7 @@ int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int bl int register_opaque_master(const struct opaque_master *mst) { - struct registered_master rmst; + struct registered_master rmst = {0}; if (!mst->probe || !mst->read || !mst->write || !mst->erase) { msg_perr("%s called with incomplete master definition. " -- cgit v1.2.3