From 086c014de23796afd3e6ae3868cf284eb6e351e0 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 5 Jul 2022 23:56:31 +0800 Subject: [PATCH] pddb: close all related filehandles when a file is deleted Signed-off-by: Sean Cross --- services/pddb/src/libstd/mod.rs | 21 +++++++++++---------- services/pddb/src/main.rs | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/services/pddb/src/libstd/mod.rs b/services/pddb/src/libstd/mod.rs index 9ed8062a9..0cb709c3d 100644 --- a/services/pddb/src/libstd/mod.rs +++ b/services/pddb/src/libstd/mod.rs @@ -336,7 +336,6 @@ pub(crate) fn open_key( crate::PddbRetcode::AccessDenied })?; - let mut writer = backing .writer(*b"KyOR") .ok_or(crate::PddbRetcode::InternalError)?; @@ -542,7 +541,7 @@ pub(crate) fn delete_key( mem: &mut xous::MemoryMessage, pddb_os: &mut PddbOs, basis_cache: &mut BasisCache, - fds: &mut Vec>, + all_fds: &mut std::collections::HashMap, Vec>>, ) -> Result<(), crate::PddbRetcode> { // Convert the memory to a Senres buffer let backing = senres::Message::from_mut_slice(mem.buf.as_slice_mut()) @@ -580,14 +579,16 @@ pub(crate) fn delete_key( Err(crate::PddbRetcode::UnexpectedEof) })?; - // Mark the entries as deleted in all remaining file handles - for fd in fds - .iter_mut() - .filter(|f| f.is_some()) - .map(|f| f.as_mut().unwrap()) - { - if fd.basis == basis && fd.key == key && fd.dict == dict { - fd.deleted = true; + // Mark the entry as deleted in all remaining file handles in the entire system + for fds in all_fds.values_mut() { + for fd in fds + .iter_mut() + .filter(|f| f.is_some()) + .map(|f| f.as_mut().unwrap()) + { + if fd.basis == basis && fd.key == key && fd.dict == dict { + fd.deleted = true; + } } } diff --git a/services/pddb/src/main.rs b/services/pddb/src/main.rs index 0bffc070a..509b64e7e 100644 --- a/services/pddb/src/main.rs +++ b/services/pddb/src/main.rs @@ -1045,7 +1045,7 @@ fn wrapped_main() -> ! { Opcode::DeleteKeyStd => { if let Some(mem) = msg.body.memory_message_mut() { mem.offset = None; - if let Err(err) = libstd::delete_key(mem, &mut pddb_os, &mut basis_cache, fd_mapping.entry(msg.sender.pid()).or_default()) { + if let Err(err) = libstd::delete_key(mem, &mut pddb_os, &mut basis_cache, &mut fd_mapping) { mem.offset = xous::MemoryAddress::new(err as usize); } }