summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorBarnali Sarkar <barnali.sarkar@intel.com>2017-03-07 17:11:03 +0530
committerAaron Durbin <adurbin@chromium.org>2017-03-10 19:59:58 +0100
commit6497cd9744394782a18da28bf6228143f8f32de7 (patch)
tree31581ff4bdc5dd66fe785d9553988fe4b4340da9 /src/soc/intel
parent674c089922332a600ac69c596a174c3ad2bce5c4 (diff)
downloadcoreboot-6497cd9744394782a18da28bf6228143f8f32de7.tar.xz
soc/intel/common: Pass the minimum possible string length for strncpy
In strncpy() function of dimm_info_fill(), the minimum possible size of Module Part Number of DIMM is passed as argument. BUG=chrome-os-partner:61729 BRANCH=none TEST=Build and boot KBLRVP to verify the type 17 DIMM info coming in SMBIOS Table from Kernel command "dmidecode". Change-Id: Icc7667149eae9705b91e271628af1b443eb8556e Signed-off-by: Barnali Sarkar <barnali.sarkar@intel.com> Reviewed-on: https://review.coreboot.org/18617 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/common/smbios.c6
-rw-r--r--src/soc/intel/common/smbios.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/soc/intel/common/smbios.c b/src/soc/intel/common/smbios.c
index 3aee9ff424..6c14ff0b67 100644
--- a/src/soc/intel/common/smbios.c
+++ b/src/soc/intel/common/smbios.c
@@ -20,7 +20,8 @@
/* Fill the SMBIOS memory information from FSP MEM_INFO_DATA_HOB in CBMEM.*/
void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
- u32 frequency, u8 channel_id, u8 dimm_id, const char *module_part_num,
+ u32 frequency, u8 channel_id, u8 dimm_id,
+ const char *module_part_num, size_t module_part_number_size,
u16 data_width)
{
dimm->dimm_size = dimm_capacity;
@@ -30,7 +31,8 @@ void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
dimm->dimm_num = dimm_id;
strncpy((char *)dimm->module_part_number,
module_part_num,
- sizeof(dimm->module_part_number));
+ min(sizeof(dimm->module_part_number),
+ module_part_number_size));
switch (data_width) {
case 8:
dimm->bus_width = MEMORY_BUS_WIDTH_8;
diff --git a/src/soc/intel/common/smbios.h b/src/soc/intel/common/smbios.h
index d38d6128c8..4750d3cd7d 100644
--- a/src/soc/intel/common/smbios.h
+++ b/src/soc/intel/common/smbios.h
@@ -21,7 +21,8 @@
/* Fill the SMBIOS memory information from FSP MEM_INFO_DATA_HOB in CBMEM.*/
void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
- u32 frequency, u8 channel_id, u8 dimm_id, const char *module_part_num,
+ u32 frequency, u8 channel_id, u8 dimm_id,
+ const char *module_part_num, size_t module_part_number_size,
u16 data_width);
#endif /* _COMMON_SMBIOS_H_ */