From 8a3f6a2b43575cecc175b696f7c32da9b168e3b8 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 23 Nov 2020 15:19:02 +0800 Subject: [PATCH] kernel: fix mutableborrow message returning We weren't properly updating the packet when a mutableborrow was getting returned. Signed-off-by: Sean Cross --- kernel/src/services.rs | 6 ++++-- kernel/src/syscall.rs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/src/services.rs b/kernel/src/services.rs index 80665b968..300a6c3a1 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -1174,6 +1174,7 @@ impl SystemServices { _dest_tid: TID, dest_virt: *mut u8, len: usize, + _buf: MemoryRange, ) -> Result<*mut u8, xous_kernel::Error> { if len == 0 { return Err(xous_kernel::Error::BadAddress); @@ -1223,9 +1224,10 @@ impl SystemServices { dest_pid: PID, dest_tid: TID, _dest_virt: *mut u8, - len: usize, + _len: usize, + buf: MemoryRange, ) -> Result<*mut u8, xous_kernel::Error> { - let buf = unsafe { core::slice::from_raw_parts(src_virt, len) }; + let buf = unsafe { core::slice::from_raw_parts(buf.as_ptr(), buf.len()) }; let current_pid = self.current_pid(); { let target_process = self.get_process(dest_pid)?; diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index 08387b345..5ea187216 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -309,6 +309,7 @@ fn return_memory( client_tid, client_addr.get() as _, len.get(), + buf, )?; // Unblock the client context to allow it to continue.