diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2021-02-03 11:19:41 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2021-05-07 02:10:48 +0000 |
| commit | 4eef651ff503f81b778e5af0ed78354e0dec0dd7 (patch) | |
| tree | a27e5569e594843a4cfea135d557ca4a880adf02 /programmer.c | |
| parent | 1a9441f7487aea5b2a03e6aa88157261c5c2ba9b (diff) | |
| download | flashrom-4eef651ff503f81b778e5af0ed78354e0dec0dd7.tar.gz flashrom-4eef651ff503f81b778e5af0ed78354e0dec0dd7.tar.bz2 flashrom-4eef651ff503f81b778e5af0ed78354e0dec0dd7.zip | |
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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/50246
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-by: Daniel Campello <campello@chromium.org>
Reviewed-by: Sam McNally <sammc@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'programmer.c')
| -rw-r--r-- | programmer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/programmer.c b/programmer.c index bee60e386..42ea2e3b9 100644 --- a/programmer.c +++ b/programmer.c @@ -83,7 +83,8 @@ void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf, int register_par_master(const struct par_master *mst, const enum chipbustype buses) { - struct registered_master rmst; + struct registered_master rmst = {0}; + if (!mst->chip_writeb || !mst->chip_writew || !mst->chip_writel || !mst->chip_writen || !mst->chip_readb || !mst->chip_readw || !mst->chip_readl || !mst->chip_readn) { |