aboutsummaryrefslogtreecommitdiffstats
path: root/src/vendorcode
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2014-10-10 14:11:11 -0700
committerAaron Durbin <adurbin@google.com>2015-04-07 23:02:18 +0200
commit8c5e4d93db845fc1942438d54eedbdefcfd2bbf9 (patch)
tree5a41e2eeffe1617c1e5bed10759668199c8f9318 /src/vendorcode
parent424d79b02900011eaa851306f71d2e76b13b4740 (diff)
downloadcoreboot-8c5e4d93db845fc1942438d54eedbdefcfd2bbf9.tar.gz
coreboot-8c5e4d93db845fc1942438d54eedbdefcfd2bbf9.tar.xz
coreboot-8c5e4d93db845fc1942438d54eedbdefcfd2bbf9.zip
cbfs: Enforce media->map() result checking, improve error messages
If you try to boot a VBOOT2_VERIFY_FIRMWARE with less than 4K CBFS cache right now, your system will try and fail to validate the FMAP signature at (u8 *)0xFFFFFFFF and go into recovery mode. This patch avoids the memcmp() to potentially invalid memory, and also adds an error message to cbfs_simple_buffer_map() to make it explicit that we ran out of CBFS cache space. BUG=None TEST=Booted on Veyron_Pinky with reduced CBFS cache, saw the message. Original-Change-Id: Ic5773b4e0b36dc621513f58fc9bd29c17afbf1b7 Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/222899 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> (cherry picked from commit 0ed3c0c2b63be0d32e8162faf892e41cef1f1f23) Signed-off-by: Aaron Durbin <adurbin@chromium.org> Change-Id: I20ccac83bff4a377caca6327d0e21032efff44c1 Reviewed-on: http://review.coreboot.org/9373 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/vendorcode')
-rw-r--r--src/vendorcode/google/chromeos/fmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vendorcode/google/chromeos/fmap.c b/src/vendorcode/google/chromeos/fmap.c
index a8425c0d1..7c1f626f8 100644
--- a/src/vendorcode/google/chromeos/fmap.c
+++ b/src/vendorcode/google/chromeos/fmap.c
@@ -51,7 +51,8 @@ const struct fmap *fmap_find(void)
media->close(media);
#endif
- if (memcmp(fmap, FMAP_SIGNATURE, sizeof(FMAP_SIGNATURE)-1)) {
+ if (fmap == CBFS_MEDIA_INVALID_MAP_ADDRESS ||
+ memcmp(fmap, FMAP_SIGNATURE, sizeof(FMAP_SIGNATURE) - 1)) {
printk(BIOS_DEBUG, "No FMAP found at %p.\n", fmap);
return NULL;
}