erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: soc/intel/common: Pass the minimum possible string length for strncpy

Browse source 
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: Id26d55a11f8c4bcbdedc6c34d7b48198e2501f4f
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 6497cd9744
Original-Change-Id: Icc7667149eae9705b91e271628af1b443eb8556e
Original-Signed-off-by: Barnali Sarkar <barnali.sarkar@intel.com>
Original-Reviewed-on: https://review.coreboot.org/18617
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/453361
This commit is contained in:
Barnali Sarkar 2017-03-07 17:11:03 +05:30 • committed by chrome-bot
commit 4d4655f184
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/soc/intel/common/smbios.c
View file

@ -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;

3
src/soc/intel/common/smbios.h
View file

@ -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_ */