GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd/{hudson,stoneyridge}: fix out of bounds read 

southbridge/amd/pi/hudson/imc.c procedure enable_imc_thermal_zone was
identified by coverity as having out of bounds access. Copies of the
procedure are present in southbridge/amd/agesa/hudson/imc.c and in
soc/amd/stoneyridge/imc.c. Fix the procedure in all 3 files.

Fixes coverity CID 1260807: Out-of-bounds read.

BUG=b:69835834
TEST=Build and platform boot to OS

Change-Id: Ic16edc607358b9a688151735e6fcb3393d3bce80
Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/22619
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Richard Spiegel 2017-11-28 06:54:02 -07:00 committed by Martin Roth
parent b077b91e60
commit 4195b10d52
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/amd/stoneyridge/imc.c
View File

@ -50,7 +50,7 @@ void enable_imc_thermal_zone(void)
{ {
AMD_CONFIG_PARAMS StdHeader; AMD_CONFIG_PARAMS StdHeader;
UINT8 FunNum; UINT8 FunNum;
UINT8 regs[9]; UINT8 regs[10];
int i; int i;
regs[0] = 0; regs[0] = 0;
@ -61,7 +61,7 @@ void enable_imc_thermal_zone(void)
WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader);
WaitForEcLDN9MailboxCmdAck(&StdHeader); WaitForEcLDN9MailboxCmdAck(&StdHeader);
for (i = 2 ; i <= 9 ; i++) for (i = 2 ; i < ARRAY_SIZE(regs) ; i++)
ReadECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader); ReadECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader);
/* enable thermal zone 0 */ /* enable thermal zone 0 */
@ -69,7 +69,7 @@ void enable_imc_thermal_zone(void)
regs[0] = 0; regs[0] = 0;
regs[1] = 0; regs[1] = 0;
FunNum = Fun_81; FunNum = Fun_81;
for (i = 0 ; i <= 9 ; i++) for (i = 0 ; i < ARRAY_SIZE(regs) ; i++)
WriteECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader); WriteECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader);
WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader);
WaitForEcLDN9MailboxCmdAck(&StdHeader); WaitForEcLDN9MailboxCmdAck(&StdHeader);

6
src/southbridge/amd/agesa/hudson/imc.c
View File

@ -60,7 +60,7 @@ void enable_imc_thermal_zone(void)
{ {
AMD_CONFIG_PARAMS StdHeader; AMD_CONFIG_PARAMS StdHeader;
UINT8 FunNum; UINT8 FunNum;
UINT8 regs[9]; UINT8 regs[10];
int i; int i;
regs[0] = 0; regs[0] = 0;
@ -71,7 +71,7 @@ void enable_imc_thermal_zone(void)
WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); // function number WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); // function number
WaitForEcLDN9MailboxCmdAck(&StdHeader); WaitForEcLDN9MailboxCmdAck(&StdHeader);
for (i = 2; i <= 9; i++) for (i = 2; i < ARRAY_SIZE(regs); i++)
ReadECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader); ReadECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader);
/* enable thermal zone 0 */ /* enable thermal zone 0 */
@ -79,7 +79,7 @@ void enable_imc_thermal_zone(void)
regs[0] = 0; regs[0] = 0;
regs[1] = 0; regs[1] = 0;
FunNum = Fun_81; FunNum = Fun_81;
for (i = 0; i <= 9; i++) for (i = 0; i < ARRAY_SIZE(regs); i++)
WriteECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader); WriteECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader);
WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); // function number WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); // function number
WaitForEcLDN9MailboxCmdAck(&StdHeader); WaitForEcLDN9MailboxCmdAck(&StdHeader);

6
src/southbridge/amd/pi/hudson/imc.c
View File

@ -56,7 +56,7 @@ void enable_imc_thermal_zone(void)
{ {
AMD_CONFIG_PARAMS StdHeader; AMD_CONFIG_PARAMS StdHeader;
UINT8 FunNum; UINT8 FunNum;
UINT8 regs[9]; UINT8 regs[10];
int i; int i;
regs[0] = 0; regs[0] = 0;
@ -67,7 +67,7 @@ void enable_imc_thermal_zone(void)
WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader);
WaitForEcLDN9MailboxCmdAck(&StdHeader); WaitForEcLDN9MailboxCmdAck(&StdHeader);
for (i = 2; i <= 9; i++) for (i = 2; i < ARRAY_SIZE(regs); i++)
ReadECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader); ReadECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader);
/* enable thermal zone 0 */ /* enable thermal zone 0 */
@ -75,7 +75,7 @@ void enable_imc_thermal_zone(void)
regs[0] = 0; regs[0] = 0;
regs[1] = 0; regs[1] = 0;
FunNum = Fun_81; FunNum = Fun_81;
for (i = 0; i <= 9; i++) for (i = 0; i < ARRAY_SIZE(regs); i++)
WriteECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader); WriteECmsg(MSG_REG0 + i, AccessWidth8, &regs[i], &StdHeader);
WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader); WriteECmsg(MSG_SYS_TO_IMC, AccessWidth8, &FunNum, &StdHeader);
WaitForEcLDN9MailboxCmdAck(&StdHeader); WaitForEcLDN9MailboxCmdAck(&StdHeader);