sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb/intel/{bd82x6x,ibexpeak}: Fix out of bounds access in intel_me_status()

Browse Source 
On Ibex Peak (and maybe also on other platforms), when the AltMeDisable
bit is set (-S or -s option of me_cleaner), the ME PCI device disappears
from the bus and its configuration space is all ones.

This causes a freeze in intel_me_status(), as coreboot tries to access
an out of bounds array element.

Change-Id: I957abebe1db15ec2c9a2b439f0103106bfa56b33
Signed-off-by: Nicola Corna <nicola@corna.info>
Reviewed-on: https://review.coreboot.org/26601
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
This commit is contained in:
Nicola Corna
2018-05-15 17:15:03 +02:00
committed by Patrick Georgi
parent b433d26ef1
commit 14604dad4e
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/southbridge/intel/bd82x6x/early_me.c
View File

@@ -18,6 +18,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/pci_ids.h>
#include <device/pci_def.h>
#include <halt.h>
#include <string.h>
#include <timestamp.h>
@@ -45,11 +46,17 @@ void intel_early_me_status(void)
{
struct me_hfs hfs;
struct me_gmes gmes;
u32 id = pci_read_config32(PCH_ME_DEV, PCI_VENDOR_ID);
pci_read_dword_ptr(&hfs, PCI_ME_HFS);
pci_read_dword_ptr(&gmes, PCI_ME_GMES);
if ((id == 0xffffffff) || (id == 0x00000000) ||
(id == 0x0000ffff) || (id == 0xffff0000)) {
printk(BIOS_DEBUG, "Missing Intel ME PCI device.\n");
} else {
pci_read_dword_ptr(&hfs, PCI_ME_HFS);
pci_read_dword_ptr(&gmes, PCI_ME_GMES);
intel_me_status(&hfs, &gmes);
intel_me_status(&hfs, &gmes);
}
}
int intel_early_me_init(void)

13
src/southbridge/intel/bd82x6x/early_me_mrc.c
View File

@@ -18,6 +18,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/pci_ids.h>
#include <device/pci_def.h>
#include <halt.h>
#include <string.h>
#include "me.h"
@@ -51,11 +52,17 @@ void intel_early_me_status(void)
{
struct me_hfs hfs;
struct me_gmes gmes;
u32 id = pci_read_config32(PCH_ME_DEV, PCI_VENDOR_ID);
pci_read_dword_ptr(&hfs, PCI_ME_HFS);
pci_read_dword_ptr(&gmes, PCI_ME_GMES);
if ((id == 0xffffffff) || (id == 0x00000000) ||
(id == 0x0000ffff) || (id == 0xffff0000)) {
printk(BIOS_DEBUG, "Missing Intel ME PCI device.\n");
} else {
pci_read_dword_ptr(&hfs, PCI_ME_HFS);
pci_read_dword_ptr(&gmes, PCI_ME_GMES);
intel_me_status(&hfs, &gmes);
intel_me_status(&hfs, &gmes);
}
}
int intel_early_me_init(void)