diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2015-11-11 18:43:11 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-11-13 00:53:11 +0100 |
| commit | 9b24f7ca9abddfb9df9c084995486f7b55695835 (patch) | |
| tree | 60288c0c035e6655ec88b3e1e61ee31f8f301a6c | |
| parent | 66aae6d3ba15fd673ccadf94c014bba540a45260 (diff) | |
| download | coreboot-9b24f7ca9abddfb9df9c084995486f7b55695835.tar.xz | |
cbfstool: Add way to access entire backing data for a buffer
This is required to handle certain relative-to-flash-start offsets.
BUG=none
BRANCH=tot
TEST=none
Change-Id: I8b30c7b532e330af5db4b8ed65b21774c6cbbd25
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 596ba1aaa62aedb2b214ca55444e3068b9cb1044
Original-Change-Id: Idc9a5279f16951befec4d84aab35117988f7edb7
Original-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/312220
Original-Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Original-Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/12415
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | util/cbfstool/common.c | 2 | ||||
| -rw-r--r-- | util/cbfstool/common.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 44836ab6d7..09a7449c15 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -115,7 +115,7 @@ void buffer_delete(struct buffer *buffer) buffer->name = NULL; } if (buffer->data) { - free(buffer->data - buffer->offset); + free(buffer_get_original_backing(buffer)); buffer->data = NULL; } buffer->offset = 0; diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index b61c2c0a5e..561a17abe3 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -120,6 +120,14 @@ static inline bool buffer_check_magic(const struct buffer *b, const char *magic, memcmp(b->data, magic, magic_len) == 0; } +/* Returns the start of the underlying buffer, with the offset undone */ +static inline void *buffer_get_original_backing(const struct buffer *b) +{ + if (!b) + return NULL; + return b->data - b->offset; +} + /* Creates an empty memory buffer with given size. * Returns 0 on success, otherwise non-zero. */ int buffer_create(struct buffer *buffer, size_t size, const char *name); |