summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Zhao <john.zhao@intel.com>2019-05-31 10:44:46 -0700
committerMartin Roth <martinroth@google.com>2019-06-03 18:24:06 +0000
commit317cbd6f02e5f49bbc64dd0de0082c313c77c6b1 (patch)
tree4c78e1adf59502dc0575dbe9a9523156bbcf1ab0
parent9995418166bc4074de2a99aa50e74f8a88196c39 (diff)
downloadcoreboot-317cbd6f02e5f49bbc64dd0de0082c313c77c6b1.tar.xz
src/soc/intel: Avoid NULL pointer dereference
Coverity detects pointer mem_info as NULL_RETURNS. Add sanity check for mem_info to prevent NULL pointer dereference. BUG=CID 1401394 TEST=Built and boot up to kernel. Change-Id: I9d78ab38b8b2dd3734e0143acfd88d9093f16ce6 Signed-off-by: John Zhao <john.zhao@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33152 Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/broadwell/romstage/raminit.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c
index fc8b7c6984..c13761df3a 100644
--- a/src/soc/intel/broadwell/romstage/raminit.c
+++ b/src/soc/intel/broadwell/romstage/raminit.c
@@ -122,6 +122,12 @@ void raminit(struct pei_data *pei_data)
printk(BIOS_DEBUG, "create cbmem for dimm information\n");
mem_info = cbmem_add(CBMEM_ID_MEMINFO, sizeof(struct memory_info));
+
+ if (!mem_info) {
+ printk(BIOS_ERR, "Error! Failed to add mem_info to cbmem\n");
+ return;
+ }
+
memset(mem_info, 0, sizeof(*mem_info));
/* Translate pei_memory_info struct data into memory_info struct */
mem_info->dimm_cnt = pei_data->meminfo.dimm_cnt;