diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2013-03-09 10:52:50 +0100 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2013-03-12 10:23:12 +0100 |
| commit | db2e3aa2578a931924f5bd269b0279bd403263ea (patch) | |
| tree | c3bd957e33cbda84a951ef4bd5c4bdb6a21a8a61 /payloads/libpayload/libcbfs/ram_media.c | |
| parent | 6e7abcd4b58326dc2ea45f1523968d5a099bf6e1 (diff) | |
libpayload: Fix reading x86 CBFS images from RAM
Three issues:
1. the hardcoded dereferenced pointer at 0xfffffffc
2. "RAM media" has no idea about ROM relative addresses
3. off-by-one in RAM media: it's legal to request 4 bytes from 0xfffffffc
Change-Id: I671ac12d412c71dc8e8e6114f2ea13f58dd99c1d
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/2624
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Diffstat (limited to 'payloads/libpayload/libcbfs/ram_media.c')
| -rw-r--r-- | payloads/libpayload/libcbfs/ram_media.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/payloads/libpayload/libcbfs/ram_media.c b/payloads/libpayload/libcbfs/ram_media.c index 87b5292b63..1a0500e1be 100644 --- a/payloads/libpayload/libcbfs/ram_media.c +++ b/payloads/libpayload/libcbfs/ram_media.c @@ -43,7 +43,11 @@ static int ram_open(struct cbfs_media *media) { static void *ram_map(struct cbfs_media *media, size_t offset, size_t count) { struct ram_media *m = (struct ram_media*)media->context; - if (offset + count >= m->size) { + /* assume addressing from top of image in this case */ + if (offset > 0xf0000000) { + offset = m->size + offset; + } + if (offset + count > m->size) { printf("ERROR: ram_map: request out of range (0x%x+0x%x)\n", offset, count); return NULL; |