diff --git a/src/context/arch/x86_64.rs b/src/context/arch/x86_64.rs index 85d172aafd3eb52e92d756ce096b52591aee63e4..fa108a0a7165f6f089cd0e15b12f3af3503c83d7 100644 --- a/src/context/arch/x86_64.rs +++ b/src/context/arch/x86_64.rs @@ -53,7 +53,7 @@ impl Context { } } - pub fn get_page_table(&self) -> usize { + pub fn get_page_table(&mut self) -> usize { self.cr3 } diff --git a/src/ptrace.rs b/src/ptrace.rs index b3631969823be1ef4af28b1dcc4e75e04c5256f1..193c702ee99d39ba5f0ba773dfc73ab85ceceac1 100644 --- a/src/ptrace.rs +++ b/src/ptrace.rs @@ -421,7 +421,7 @@ pub unsafe fn regs_for_mut(context: &mut Context) -> Option<&mut InterruptStack> // |_| |_|\___|_| |_| |_|\___/|_| \__, | // |___/ -pub fn with_context_memory<F>(context: &Context, offset: VirtualAddress, len: usize, f: F) -> Result<()> +pub fn with_context_memory<F>(context: &mut Context, offset: VirtualAddress, len: usize, f: F) -> Result<()> where F: FnOnce(*mut u8) -> Result<()> { // As far as I understand, mapping any regions following diff --git a/src/scheme/proc.rs b/src/scheme/proc.rs index 9eaf0d4a0e5e2b921f591bdd0d9e2c0bb1be6c48..31672bc0703bd84bd3b2db6fce4a1397239de7be 100644 --- a/src/scheme/proc.rs +++ b/src/scheme/proc.rs @@ -321,9 +321,9 @@ impl Scheme for ProcScheme { let contexts = context::contexts(); let context = contexts.get(info.pid).ok_or(Error::new(ESRCH))?; - let context = context.read(); + let mut context = context.write(); - ptrace::with_context_memory(&context, data.offset, buf.len(), |ptr| { + ptrace::with_context_memory(&mut context, data.offset, buf.len(), |ptr| { buf.copy_from_slice(validate::validate_slice(ptr, buf.len())?); Ok(()) })?; @@ -411,9 +411,9 @@ impl Scheme for ProcScheme { let contexts = context::contexts(); let context = contexts.get(info.pid).ok_or(Error::new(ESRCH))?; - let context = context.read(); + let mut context = context.write(); - ptrace::with_context_memory(&context, data.offset, buf.len(), |ptr| { + ptrace::with_context_memory(&mut context, data.offset, buf.len(), |ptr| { validate::validate_slice_mut(ptr, buf.len())?.copy_from_slice(buf); Ok(()) })?; diff --git a/src/scheme/user.rs b/src/scheme/user.rs index afcb48b35e6f89dcb2706a6224acd37544ea97fa..32766d913eb93caa860ba610845e50a562433270 100644 --- a/src/scheme/user.rs +++ b/src/scheme/user.rs @@ -114,13 +114,13 @@ impl UserInner { Ok(0) } else { let context_lock = context_weak.upgrade().ok_or(Error::new(ESRCH))?; - let context = context_lock.read(); - - let mut grants = context.grants.lock(); + let mut context = context_lock.write(); let mut new_table = unsafe { InactivePageTable::from_address(context.arch.get_page_table()) }; let mut temporary_page = TemporaryPage::new(Page::containing_address(VirtualAddress::new(crate::USER_TMP_GRANT_OFFSET))); + let mut grants = context.grants.lock(); + let from_address = (address/4096) * 4096; let offset = address - from_address; let full_size = ((offset + size + 4095)/4096) * 4096; @@ -170,13 +170,13 @@ impl UserInner { Ok(()) } else { let context_lock = self.context.upgrade().ok_or(Error::new(ESRCH))?; - let context = context_lock.read(); - - let mut grants = context.grants.lock(); + let mut context = context_lock.write(); let mut new_table = unsafe { InactivePageTable::from_address(context.arch.get_page_table()) }; let mut temporary_page = TemporaryPage::new(Page::containing_address(VirtualAddress::new(crate::USER_TMP_GRANT_OFFSET))); + let mut grants = context.grants.lock(); + for i in 0 .. grants.len() { let start = grants[i].start_address().get(); let end = start + grants[i].size();