diff options
author | Treehugger Robot | 2018-04-12 00:56:27 -0500 |
---|---|---|
committer | Gerrit Code Review | 2018-04-12 00:56:27 -0500 |
commit | 53135a4772531713b56c1676858f8be0096b0847 (patch) | |
tree | 2f8d2209f62847845b67db706c510f310a8bf9a2 | |
parent | af15fbf9aa6bb991a6abe8b2b72acc1a9405eff9 (diff) | |
parent | 91dfaecca7db64689c2f572b72d838d70a638093 (diff) | |
download | platform-system-core-53135a4772531713b56c1676858f8be0096b0847.tar.gz platform-system-core-53135a4772531713b56c1676858f8be0096b0847.tar.xz platform-system-core-53135a4772531713b56c1676858f8be0096b0847.zip |
Merge "fastboot: fix header_actual calculation"
-rw-r--r-- | fastboot/bootimg_utils.cpp | 2 |
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 | |||
44 | const boot_img_hdr_v1& src, int64_t* bootimg_size) { | 44 | const boot_img_hdr_v1& src, int64_t* bootimg_size) { |
45 | const size_t page_mask = src.page_size - 1; | 45 | const size_t page_mask = src.page_size - 1; |
46 | 46 | ||
47 | int64_t header_actual = sizeof(boot_img_hdr_v1) & (~page_mask); | 47 | int64_t header_actual = (sizeof(boot_img_hdr_v1) + page_mask) & (~page_mask); |
48 | int64_t kernel_actual = (kernel_size + page_mask) & (~page_mask); | 48 | int64_t kernel_actual = (kernel_size + page_mask) & (~page_mask); |
49 | int64_t ramdisk_actual = (ramdisk_size + page_mask) & (~page_mask); | 49 | int64_t ramdisk_actual = (ramdisk_size + page_mask) & (~page_mask); |
50 | int64_t second_actual = (second_size + page_mask) & (~page_mask); | 50 | int64_t second_actual = (second_size + page_mask) & (~page_mask); |