commit 958b1fa60b3fea79dbb0c27453b97a314f6df885
author Shikha Panwar <shikhapanwar@google.com> Thu Jan 12 08:06:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 12 08:06:20 2023 +0000
tree aaae8530a86a5b43a7bc3dd84f350f7d745f4bd0
parent 03c643f7d958b3df3c655485d6fe1e8136856d63
parent 58fdf03ca8a4f07945ca82ec378cfdbec470b9ef

Merge "Fix padding_size applied to ramdisk"

microdroid/initrd/src/main.rs

diff --git a/microdroid/initrd/src/main.rs b/microdroid/initrd/src/main.rs
index 69c6ae4..3f1fab5 100644
--- a/microdroid/initrd/src/main.rs
+++ b/microdroid/initrd/src/main.rs
@@ -54,7 +54,8 @@
         checksum += get_checksum(&bootconfig)?;
     }
 
-    let padding_size: usize = FOOTER_ALIGNMENT - (initrd_size + bootconfig_size) % FOOTER_ALIGNMENT;
+    let padding_size: usize =
+        (FOOTER_ALIGNMENT - (initrd_size + bootconfig_size) % FOOTER_ALIGNMENT) % FOOTER_ALIGNMENT;
     output_file.write_all(&ZEROS[..padding_size])?;
     output_file.write_all(&((padding_size + bootconfig_size) as u32).to_le_bytes())?;
     output_file.write_all(&checksum.to_le_bytes())?;