commit 665efb0aff088e36f48e4b8e52260470211f9ac6
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 12 10:18:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 12 10:18:48 2018 +0000
tree 8d2410ec81a30d53a51916017ecf324dbd706e8d
parent 4d8681649bd15a54981b880103477ce18b1591c9
parent ad24bce6d827c727422ae23967e66c3b3d6b87d3

Merge "storaged: update OWNERS"

fastboot/bootimg_utils.cpp

diff --git a/fastboot/bootimg_utils.cpp b/fastboot/bootimg_utils.cpp
index feacaa1..c9814e4 100644
--- a/fastboot/bootimg_utils.cpp
+++ b/fastboot/bootimg_utils.cpp
@@ -44,7 +44,7 @@
                            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);