Skip to content
Snippets Groups Projects
Commit 56414849 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Copy redoxfs password to page aligned space

parent 8b70c965
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,7 @@ use core::{ ...@@ -22,6 +22,7 @@ use core::{
cmp, cmp,
fmt::{self, Write}, fmt::{self, Write},
mem, mem,
ptr,
slice, slice,
str, str,
}; };
...@@ -488,10 +489,11 @@ fn main< ...@@ -488,10 +489,11 @@ fn main<
} }
writeln!(w).unwrap(); writeln!(w).unwrap();
if let Some(password) = password_opt { if let Some(password) = password_opt {
//TODO: copy to reserved page let password_size = password.len();
writeln!(w, "REDOXFS_PASSWORD_ADDR={:016x}", password.as_ptr() as usize).unwrap(); let password_base = os.alloc_zeroed_page_aligned(password_size);
writeln!(w, "REDOXFS_PASSWORD_SIZE={:016x}", password.len()).unwrap(); unsafe { ptr::copy(password.as_ptr(), password_base, password_size); }
mem::forget(password); writeln!(w, "REDOXFS_PASSWORD_ADDR={:016x}", password_base as usize).unwrap();
writeln!(w, "REDOXFS_PASSWORD_SIZE={:016x}", password_size).unwrap();
} }
if let Some(mut mode) = mode_opt { if let Some(mut mode) = mode_opt {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment