UPSTREAM: sb/intel/{bd82x6x,ibexpeak}: Fix out of bounds access in intel_me_status()
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.
BUG=none
BRANCH=none
TEST=none
Change-Id: I1b41dd2682819c3e92a443a8264ba99c11565a74
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 14604dad4e470e8140d18296bd28b42c4bb26668
Original-Change-Id: I957abebe1db15ec2c9a2b439f0103106bfa56b33
Original-Signed-off-by: Nicola Corna <nicola@corna.info>
Original-Reviewed-on: https://review.coreboot.org/26601
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://chromium-review.googlesource.com/1075788
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/src/southbridge/intel/bd82x6x/early_me.c b/src/southbridge/intel/bd82x6x/early_me.c
index 47b8708..bda139b 100644
--- a/src/southbridge/intel/bd82x6x/early_me.c
+++ b/src/southbridge/intel/bd82x6x/early_me.c
@@ -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 @@
{
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)
diff --git a/src/southbridge/intel/bd82x6x/early_me_mrc.c b/src/southbridge/intel/bd82x6x/early_me_mrc.c
index 8faab62..a6562c7 100644
--- a/src/southbridge/intel/bd82x6x/early_me_mrc.c
+++ b/src/southbridge/intel/bd82x6x/early_me_mrc.c
@@ -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 @@
{
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)
