saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-04 04:27:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup the offsets for decrypt_src_page_at()

Browse source 
We had a "coincidence" before that allowed things to work,
where we had some data line up that we happened to think
was some other header data, so we "fixed" it by
subtracting the offset of the header data.

Actually, it wasn't.

Clarify that decrypt_src_page_at() offsets are relative
to the beginning of encrypted data, and not relative
to the absolute beginning of the disk.

Image creation is now fixed so that stuff lines up to what
this routine expects, and some asserts added to try and
save ourselves in the future as we try to fix other bugs
we discover over time.

loaders are hard.
This commit is contained in:
bunnie 2024-05-06 18:55:11 +08:00
parent 63c316f32a
commit 5ab014e715
6 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.vscode/settings.json vendored
View file

@ -8,11 +8,9 @@
"--target-dir",
"target/analyzer",
"--features",
"precursor",
"cramium-soc",
"--features",
"utralib/precursor",
"--features",
"utralib/precursor-pvt",
"utralib/cramium-soc",
"--message-format",
"json"
],
@ -20,7 +18,7 @@
"XOUS_SVD_FILE": "../precursors/soc.svd"
},
"rust-analyzer.cargo.features": [
"precursor",
"cramium-soc",
"swap",
"mass-storage"
],

4
loader/src/main.rs
View file

@ -413,8 +413,8 @@ pub fn read_initial_config(cfg: &mut BootConfig) {
#[cfg(feature = "swap")]
pub fn read_swap_config(cfg: &mut BootConfig) {
// Read in the swap arguments: should be located at beginning of image in swap.
let page0 = cfg.swap_hal.as_mut().unwrap().decrypt_src_page_at(0x1000);
// Read in the swap arguments: should be located at beginning of the encrypted image in swap.
let page0 = cfg.swap_hal.as_mut().unwrap().decrypt_src_page_at(0x0);
let swap_args = KernelArguments::new(page0.as_ptr() as *const usize);
for tag in swap_args.iter() {
if tag.name == u32::from_le_bytes(*b"IniS") {

1
loader/src/phase2.rs
View file

@ -230,6 +230,7 @@ pub fn phase_2(cfg: &mut BootConfig, fs_prehash: &[u8; 64]) {
// patch the entry to point at the virtual address
*entry &= 0x3FF;
*entry |= (vaddr & !0xFFF) >> 2;
println!("Remapping L2 PT @paddr {:x} -> vaddr {:x}", paddr, vaddr);
swap_pt_vaddr_offset += PAGE_SIZE;
}
}

4
loader/src/platform/cramium/swap.rs
View file

@ -343,11 +343,9 @@ impl SwapHal {
fn aad(&self) -> &[u8] { &self.aad_storage[..self.aad_len] }
/// `offset` is the offset from the beginning of the encrypted region (not full disk region)
pub fn decrypt_src_page_at(&mut self, offset: usize) -> &[u8] {
assert!((offset & 0xFFF) == 0, "offset is not page-aligned");
assert!(offset >= 0x1000);
// compensate for the unencrypted header that is not included in the `src_data_area` slice
let offset = offset - 0x1000;
self.buf_addr = offset;
self.flash_spim.mem_read((self.image_start + offset) as u32, &mut self.buf.data, false);
let mut nonce = [0u8; size_of::<Nonce>()];

12
loader/src/platform/precursor/swap.rs
View file

@ -106,11 +106,9 @@ impl SwapHal {
pub fn get_swap_key(&self) -> &[u8] { &self.ram_swap_key }
/// `offset` is the offset from the beginning of the encrypted region (not full disk region)
pub fn decrypt_src_page_at(&mut self, offset: usize) -> &[u8] {
assert!((offset & 0xFFF) == 0, "offset is not page-aligned");
assert!(offset >= 0x1000);
// compensate for the unencrypted header that is not included in the `src_data_area` slice
let offset = offset - 0x1000;
self.buf_addr = offset;
// println!("data area: {:x?}", &self.src_data_area[..4]);
// println!("offset: {:x}", offset);
@ -172,8 +170,8 @@ impl SwapHal {
/// Used to examine contents of swap RAM. Swap count is fixed at 0 by this routine. Decrypted data is
/// returned as a slice.
pub fn decrypt_swap_from(&mut self, src_offset: usize, dst_vaddr: usize, dst_pid: u8) -> &[u8] {
println!("Decrypt swap:");
println!(" offset: {:x}, vaddr: {:x}, pid: {}", src_offset, dst_vaddr, dst_pid);
// println!("Decrypt swap:");
// println!(" offset: {:x}, vaddr: {:x}, pid: {}", src_offset, dst_vaddr, dst_pid);
assert!(src_offset & (PAGE_SIZE - 1) == 0);
let mut nonce = [0u8; size_of::<Nonce>()];
nonce[0..4].copy_from_slice(&[0u8; 4]); // this is the `swap_count` field
@ -186,9 +184,9 @@ impl SwapHal {
let mut tag = [0u8; size_of::<Tag>()];
let mac_offset = (src_offset / PAGE_SIZE) * size_of::<Tag>();
tag.copy_from_slice(&self.dst_mac_area[mac_offset..mac_offset + size_of::<Tag>()]);
println!("dst_mac_area: {:x?}", &self.dst_mac_area[..32]);
// println!("dst_mac_area: {:x?}", &self.dst_mac_area[..32]);
self.buf.data.copy_from_slice(&self.dst_data_area[src_offset..src_offset + PAGE_SIZE]);
println!("Nonce: {:x?}, tag: {:x?}", &nonce, &tag);
// println!("Nonce: {:x?}, tag: {:x?}", &nonce, &tag);
match self.dst_cipher.decrypt_in_place_detached(
Nonce::from_slice(&nonce),
aad,

9
xtask/src/main.rs
View file

@ -280,11 +280,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
builder.add_loader_feature("swap");
builder.add_kernel_feature("swap");
builder.add_feature("swap");
// builder.add_kernel_feature("debug-swap");
builder.add_kernel_feature("debug-swap");
// builder.add_kernel_feature("debug-print");
// It is important that this is the first service added, because the swapper *must* be in PID 2
builder.add_service("xous-swapper", LoaderRegion::Ram);
builder.add_service("xous-swapper", LoaderRegion::Flash);
builder.add_kernel_feature("swap");
for service in swap_pkgs {
@ -468,8 +467,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// ------ Cramium hardware image configs ------
Some("cramium-fpga") | Some("cramium-soc") => {
let cramium_flash_pkgs =
["xous-ticktimer", "xous-log", "xous-names", "cram-hal-service", "cram-console"].to_vec();
let cramium_swap_pkgs = ["test-swapper", "graphics-server"].to_vec();
["xous-ticktimer", "xous-log", "xous-names", "cram-hal-service"].to_vec();
let cramium_swap_pkgs = ["test-swapper", "graphics-server", "cram-console"].to_vec();
if !builder.is_swap_set() {
builder.set_swap(0, 4 * 1024 * 1024);
}