From ab0c7d3b32a28bed58836317f2203d90e4eb80dc Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Thu, 29 Dec 2022 21:03:39 +0800 Subject: [PATCH] kernel: server: check buf is some when returning mem Signed-off-by: Sean Cross --- kernel/src/server.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/src/server.rs b/kernel/src/server.rs index 285cb1889..f62220e10 100644 --- a/kernel/src/server.rs +++ b/kernel/src/server.rs @@ -589,7 +589,7 @@ impl Server { // Sanity check the specified address was correct, and matches what we // had cached. - if is_memory && cfg!(baremetal) { + if is_memory && cfg!(baremetal) && buf.is_some() { let buf = buf.expect("memory message expected but no buffer passed!"); if server_addr != buf.as_ptr() as usize || len != buf.len() { // klog!("Memory is attached but the returned buffer doesn't match (len: {} vs {}), buf addr: {:08x} vs {:08x}", len, buf.len(), server_addr, buf.as_ptr() as usize);