Merge branch 'patch-1' of github.com:woshiluo/serde-device-tree into woshiluo-patch-1

luojia65 · luojia65 · commit 18e73608cd3c · 2024-10-10T20:34:28.000+08:00
Signed-off-by: Zhouqi Jiang &lt;luojia@hust.edu.cn&gt;
diff --git a/examples/hifive-unmatched-a00.rs b/examples/hifive-unmatched-a00.rs
@@ -4,8 +4,6 @@ use alloc::collections::BTreeMap;
 use serde_derive::Deserialize;
 use serde_device_tree::Compatible;
 
-static DEVICE_TREE: &'static [u8] = include_bytes!("hifive-unmatched-a00.dtb");
-
 #[derive(Debug, Deserialize)]
 struct Tree<'a> {
     #[serde(rename = "#address-cells")]
@@ -48,8 +46,20 @@ struct Cpu<'a> {
     compatible: Compatible<'a>,
 }
 
+const RAW_DEVICE_TREE: &'static [u8] = include_bytes!("hifive-unmatched-a00.dtb");
+const BUFFER_SIZE: usize = RAW_DEVICE_TREE.len();
+
+#[repr(align(4))]
+struct AlignedBuffer {
+    pub data: [u8; RAW_DEVICE_TREE.len()],
+}
+
 fn main() {
-    let ptr = DEVICE_TREE.as_ptr();
+    let mut aligned_data: Box<AlignedBuffer> = Box::new(AlignedBuffer {
+        data: [0; BUFFER_SIZE],
+    });
+    aligned_data.data[..BUFFER_SIZE].clone_from_slice(&RAW_DEVICE_TREE);
+    let ptr = aligned_data.data.as_ptr();
     let t: Tree = unsafe { serde_device_tree::from_raw(ptr) }.unwrap();
     println!("#address_cells = {}", t.num_address_cells);
     println!("#size_cells = {}", t.num_size_cells);
diff --git a/examples/qemu-virt.rs b/examples/qemu-virt.rs
@@ -16,10 +16,21 @@ use serde_device_tree::{
     from_raw_mut, Dtb, DtbPtr,
 };
 
+const RAW_DEVICE_TREE: &'static [u8] = include_bytes!("qemu-virt.dtb");
+const BUFFER_SIZE: usize = RAW_DEVICE_TREE.len();
+
+#[repr(align(4))]
+struct AlignedBuffer {
+    pub data: [u8; RAW_DEVICE_TREE.len()],
+}
+
 fn main() -> Result<(), Error> {
     // 整个设备树二进制文件需要装载到一块可写的内存区域
-    static DEVICE_TREE: &[u8] = include_bytes!("qemu-virt.dtb");
-    let mut slice = DEVICE_TREE.to_vec();
+    let mut aligned_data: Box<AlignedBuffer> = Box::new(AlignedBuffer {
+        data: [0; BUFFER_SIZE],
+    });
+    aligned_data.data[..BUFFER_SIZE].clone_from_slice(&RAW_DEVICE_TREE);
+    let mut slice = aligned_data.data.to_vec();
     // 这一步验证了设备树首部的正确性，`DtbPtr` 类型可以安全地传递到任何地方，
     // 甚至跨地址空间（如果你知道偏移的话）。
     let ptr = DtbPtr::from_raw(slice.as_mut_ptr())?;
@@ -127,10 +138,10 @@ fn main() -> Result<(), Error> {
 
         // 解析过程中，设备树的内容被修改了。
         // 因此若要以其他方式再次访问设备树，先将这次解析的结果释放。
-        assert_ne!(slice, DEVICE_TREE);
+        assert_ne!(slice, RAW_DEVICE_TREE);
     }
     // 释放后，内存会恢复原状。
-    assert_eq!(slice, DEVICE_TREE);
+    assert_eq!(slice, RAW_DEVICE_TREE);
 
     Ok(())
 }
diff --git a/src/de.rs b/src/de.rs
@@ -60,6 +60,9 @@ where
     T: de::Deserialize<'de>,
 {
     // read header
+    if (ptr as usize) & (ALIGN - 1) != 0 {
+        return Err(Error::unaligned(ptr as usize));
+    }
     let header = &*(ptr as *const Header);
     header.verify()?;
 
diff --git a/src/de_mut/cursor.rs b/src/de_mut/cursor.rs
@@ -2,6 +2,7 @@
 use core::marker::PhantomData;
 
 #[derive(Clone, Copy, Debug)]
+#[repr(C)]
 pub(super) struct AnyCursor<T: Type = Body>(usize, PhantomData<T>);
 
 pub(super) type BodyCursor = AnyCursor<Body>;
diff --git a/src/de_mut/reg.rs b/src/de_mut/reg.rs
@@ -22,6 +22,7 @@ pub struct RegRegion(pub Range<usize>);
 
 /// 节点地址空间格式。
 #[derive(Clone, Copy, Debug)]
+#[repr(C)]
 pub(super) struct RegConfig {
     pub address_cells: u32,
     pub size_cells: u32,

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ where`
`60`	`60`	`T: de::Deserialize<'de>,`
`61`	`61`	`{`
`62`	`62`	`// read header`
	`63`	`+ if (ptr as usize) & (ALIGN - 1) != 0 {`
	`64`	`+ return Err(Error::unaligned(ptr as usize));`
	`65`	`+ }`
`63`	`66`	`let header = &(ptr as const Header);`
`64`	`67`	`header.verify()?;`
`65`	`68`