summaryrefslogtreecommitdiff
path: root/fastboot/bootimg_utils.cpp
diff options
context:
space:
mode:
authorFernando Lugo <flugo@google.com>2018-04-11 19:02:59 -0700
committerFernando Lugo <flugo@google.com>2018-04-11 19:02:59 -0700
commit91dfaecca7db64689c2f572b72d838d70a638093 (patch)
tree2f8d2209f62847845b67db706c510f310a8bf9a2 /fastboot/bootimg_utils.cpp
parentaf15fbf9aa6bb991a6abe8b2b72acc1a9405eff9 (diff)
fastboot: fix header_actual calculation
Bug: 77920157 Test: fastboot boot $OUT/kernel Change-Id: Ibe2f4b9a6476ac11937448e6547b5159af011633 Signed-off-by: Fernando Lugo <flugo@google.com>
Diffstat (limited to 'fastboot/bootimg_utils.cpp')
-rw-r--r--fastboot/bootimg_utils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/fastboot/bootimg_utils.cpp b/fastboot/bootimg_utils.cpp
index feacaa14c..c9814e455 100644
--- a/fastboot/bootimg_utils.cpp
+++ b/fastboot/bootimg_utils.cpp
@@ -44,7 +44,7 @@ boot_img_hdr_v1* mkbootimg(void* kernel, int64_t kernel_size, void* ramdisk, int
const boot_img_hdr_v1& src, int64_t* bootimg_size) {
const size_t page_mask = src.page_size - 1;
- int64_t header_actual = sizeof(boot_img_hdr_v1) & (~page_mask);
+ int64_t header_actual = (sizeof(boot_img_hdr_v1) + page_mask) & (~page_mask);
int64_t kernel_actual = (kernel_size + page_mask) & (~page_mask);
int64_t ramdisk_actual = (ramdisk_size + page_mask) & (~page_mask);
int64_t second_actual = (second_size + page_mask) & (~page_mask);