commit 8ebf1dafdcc15326e8c3466df2383a6aed000577
author Inseob Kim <inseob@google.com> Fri Jan 27 18:12:57 2023 +0900
committer Inseob Kim <inseob@google.com> Fri Jan 27 18:13:34 2023 +0900
tree 3a7a2afdd6459bb5a363a479c44021111917289d
parent f11ada90afb56689e0ae08b292bfe71ef3d68aa3

Fix tests using unaligned pointers

Bug: 266879976
Test: atest libpvmfw_avb.integration_test
Change-Id: Ia159fa119f274379958a1383b5ea0af115e0606c

pvmfw/avb/tests/api_test.rs

diff --git a/pvmfw/avb/tests/api_test.rs b/pvmfw/avb/tests/api_test.rs
index 52119f3..b5300f9 100644
--- a/pvmfw/avb/tests/api_test.rs
+++ b/pvmfw/avb/tests/api_test.rs
@@ -175,8 +175,10 @@
             .copy_from_slice(&wrong_offset.to_be_bytes());
 
         // Assert.
-        let _footer = extract_avb_footer(&kernel)?;
-        //assert_eq!(wrong_offset, footer.vbmeta_offset);
+        let footer = extract_avb_footer(&kernel)?;
+        // footer is unaligned; copy vbmeta_offset to local variable
+        let vbmeta_offset = footer.vbmeta_offset;
+        assert_eq!(wrong_offset, vbmeta_offset);
         assert_payload_verification_with_initrd_eq(
             &kernel,
             &load_latest_initrd_normal()?,
@@ -268,10 +270,10 @@
     let mut kernel = load_latest_signed_kernel()?;
     let footer = extract_avb_footer(&kernel)?;
     let vbmeta_header = extract_vbmeta_header(&kernel, &footer)?;
-    //assert_eq!(
-    //    0, vbmeta_header.flags,
-    //    "The disable flag should not be set in the latest kernel."
-    //);
+
+    // vbmeta_header is unaligned; copy flags to local variable
+    let vbmeta_header_flags = vbmeta_header.flags;
+    assert_eq!(0, vbmeta_header_flags, "The disable flag should not be set in the latest kernel.");
     let flags_addr = ptr::addr_of!(vbmeta_header.flags) as *const u8;
     // SAFETY: It is safe as both raw pointers `flags_addr` and `vbmeta_header` are not null.
     let flags_offset = unsafe { flags_addr.offset_from(ptr::addr_of!(vbmeta_header) as *const u8) };
@@ -282,11 +284,13 @@
         .copy_from_slice(&AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED.to_be_bytes());
 
     // Assert.
-    let _vbmeta_header = extract_vbmeta_header(&kernel, &footer)?;
-    //assert_eq!(
-    //    AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED, vbmeta_header.flags,
-    //    "VBMeta verification flag should be disabled now."
-    //);
+    let vbmeta_header = extract_vbmeta_header(&kernel, &footer)?;
+    // vbmeta_header is unaligned; copy flags to local variable
+    let vbmeta_header_flags = vbmeta_header.flags;
+    assert_eq!(
+        AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED, vbmeta_header_flags,
+        "VBMeta verification flag should be disabled now."
+    );
     assert_payload_verification_with_initrd_eq(
         &kernel,
         &load_latest_initrd_normal()?,