From ab922779e34fae2e25000614ddd285c8a7994ca0 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Tue, 13 Jul 2010 00:04:52 +0000 Subject: Fix out-of-bounds ICH FREG permission printing A bit was masked, but not shifted, and that led to worst-case accesses of index 24 in an array with 4 members. I've improved readability in the variable declaration block as well. Thanks to Stephen Kou for reporting the bug. Corresponding to flashrom svn r1076. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stephen Kou --- chipset_enable.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chipset_enable.c') diff --git a/chipset_enable.c b/chipset_enable.c index 5c16259..dc0e55f 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -452,10 +452,11 @@ static void do_ich9_spi_frap(uint32_t frap, int i) "Flash Descriptor", "BIOS", "Management Engine", "Gigabit Ethernet", "Platform Data" }; - int rwperms = ((ICH_BRWA(frap) & (1 << i)) << 1) | - ((ICH_BRRA(frap) & (1 << i)) << 0); + uint32_t base, limit; + int rwperms = (((ICH_BRWA(frap) >> i) & 1) << 1) | + (((ICH_BRRA(frap) >> i) & 1) << 0); int offset = 0x54 + i * 4; - uint32_t freg = mmio_readl(ich_spibar + offset), base, limit; + uint32_t freg = mmio_readl(ich_spibar + offset); msg_pdbg("0x%02X: 0x%08x (FREG%i: %s)\n", offset, freg, i, region_names[i]); -- cgit v1.1