Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32055 )
Change subject: lib/edid.c: Dump EDID breakdown after null check ......................................................................
lib/edid.c: Dump EDID breakdown after null check
The edid variable was being dereferenced before the null check. Split off the null check to before dumping and update the error message.
Fixes CID 1370576 (REVERSE_INULL)
Signed-off-by: Jacob Garber jgarber1@ualberta.ca Change-Id: I8fe3d911df3a11a873056d3a5c05c5a3cbcfe2c0 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32055 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org --- M src/lib/edid.c 1 file changed, 8 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved
diff --git a/src/lib/edid.c b/src/lib/edid.c index 553b0a2..5925759 100644 --- a/src/lib/edid.c +++ b/src/lib/edid.c @@ -1138,11 +1138,16 @@ .conformant = EDID_CONFORMANT, };
- dump_breakdown(edid); - memset(out, 0, sizeof(*out));
- if (!edid || memcmp(edid, "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00", 8)) { + if (!edid) { + printk(BIOS_SPEW, "No EDID found\n"); + return EDID_ABSENT; + } + + dump_breakdown(edid); + + if (memcmp(edid, "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00", 8)) { printk(BIOS_SPEW, "No header found\n"); return EDID_ABSENT; }