commit 58fdf03ca8a4f07945ca82ec378cfdbec470b9ef
author Shikha Panwar <shikhapanwar@google.com> Tue Jan 10 05:36:20 2023 +0000
committer Shikha Panwar <shikhapanwar@google.com> Wed Jan 11 05:56:20 2023 +0000
tree b14001e3a2a189ead205071cb3350ab94f3afbcf
parent c5c966d2f325f611add3e2b6c3415d28be1f25df

Fix padding_size applied to ramdisk

I found out while attaching/detaching ramdisk that padding_size was
wrong.

Test: Compare initrd
Bug: 245277660
Change-Id: If5c6f89b48ad411af66a30a73c354703c318dc11

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())?;