M-Labs/zynq-rs
11
0
Fork 16
Code Issues 6 Pull Requests Releases Wiki Activity

fix UB in UncachedSlice

Browse Source
This commit is contained in:
Simon Renblad 2025-01-28 15:44:10 +08:00
parent 19efdafce7
commit af42d9b819
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcortex_a9/src/uncached.rs
View File

@ -19,8 +19,8 @@ impl<T> UncachedSlice<T> {
.max(L1_PAGE_SIZE); .max(L1_PAGE_SIZE);
let layout = Layout::from_size_align(size, align)?; let layout = Layout::from_size_align(size, align)?;
let ptr = unsafe { alloc::alloc::alloc(layout).cast::<T>() }; let ptr = unsafe { alloc::alloc::alloc(layout).cast::<T>() };
assert!(!ptr.is_null());
let start = ptr as usize; let start = ptr as usize;
assert_eq!(start & (L1_PAGE_SIZE - 1), 0);
for page_start in (start..(start + size)).step_by(L1_PAGE_SIZE) { for page_start in (start..(start + size)).step_by(L1_PAGE_SIZE) {
// non-shareable device // non-shareable device
@ -33,9 +33,6 @@ impl<T> UncachedSlice<T> {
} }
let slice = unsafe { core::slice::from_raw_parts_mut(ptr, len) }; let slice = unsafe { core::slice::from_raw_parts_mut(ptr, len) };
// verify size
assert!(unsafe { slice.get_unchecked(len) } as *const _ as usize <= start + size);
// initialize
for e in slice.iter_mut() { for e in slice.iter_mut() {
*e = default(); *e = default();
} }