diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-06-30 14:52:30 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-06 22:02:21 -0700 |
| commit | 5c537e3ea8d391937938536e7170a5bfefbdafcb (patch) | |
| tree | ded9fb37cadc4b201b43bb012814a44120073271 /host | |
| parent | 7d0cc747c75408a6edabbf4adeb4e898b6118e97 (diff) | |
| download | vboot-5c537e3ea8d391937938536e7170a5bfefbdafcb.tar.gz | |
futility: use vboot2 functions for kernel preamble
Another in a long series of refactoring changes to replace old vboot1
code with its vboot2 equivalent. Futility changes only; no change to
firmware.
BUG=chromium:611535
BRANCH=none
TEST=make runtests
Change-Id: I7be813b82820674e975db13d5e540e49bdea028d
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/366057
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/extract_vmlinuz.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/host/lib/extract_vmlinuz.c b/host/lib/extract_vmlinuz.c index dddbe561..2d8a43d1 100644 --- a/host/lib/extract_vmlinuz.c +++ b/host/lib/extract_vmlinuz.c @@ -15,10 +15,10 @@ int ExtractVmlinuz(void *kpart_data, size_t kpart_size, void **vmlinuz_out, size_t *vmlinuz_size) { size_t now = 0; - VbKernelPreambleHeader *preamble = NULL; + struct vb2_kernel_preamble *preamble = NULL; uint8_t *kblob_data = NULL; - uint64_t kblob_size = 0; - uint64_t vmlinuz_header_size = 0; + uint32_t kblob_size = 0; + uint32_t vmlinuz_header_size = 0; uint64_t vmlinuz_header_address = 0; uint64_t vmlinuz_header_offset = 0; void *vmlinuz = NULL; @@ -28,7 +28,7 @@ int ExtractVmlinuz(void *kpart_data, size_t kpart_size, if (now > kpart_size) return 1; - preamble = (VbKernelPreambleHeader *)(kpart_data + now); + preamble = (struct vb2_kernel_preamble *)(kpart_data + now); now += preamble->preamble_size; if (now > kpart_size) return 1; @@ -45,7 +45,8 @@ int ExtractVmlinuz(void *kpart_data, size_t kpart_size, } if (!vmlinuz_header_size || - kpart_data + vmlinuz_header_offset + vmlinuz_header_size > kpart_data) { + kpart_data + vmlinuz_header_offset + vmlinuz_header_size > + kpart_data) { return 1; } |