From 47ce36741e4fc5c3d81fc172e560573327dfb50c Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:47:22 +0200 Subject: [PATCH] virtio-blkd: Avoid crash on ls /scheme --- storage/virtio-blkd/src/scheme.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/storage/virtio-blkd/src/scheme.rs b/storage/virtio-blkd/src/scheme.rs index 3eec34d69b..3b37b547ff 100644 --- a/storage/virtio-blkd/src/scheme.rs +++ b/storage/virtio-blkd/src/scheme.rs @@ -210,10 +210,10 @@ impl<'a> SchemeBlockMut for DiskScheme<'a> { // to the namespace id). write!(list, "{}\n", 0).unwrap(); - let part_table = self.part_table.as_ref().unwrap(); - - for part_num in 0..part_table.partitions.len() { - write!(list, "{}p{}\n", 0, part_num).unwrap(); + if let Some(part_table) = &self.part_table { + for part_num in 0..part_table.partitions.len() { + write!(list, "{}p{}\n", 0, part_num).unwrap(); + } } let id = self.next_id; @@ -389,8 +389,11 @@ impl<'a> SchemeBlockMut for DiskScheme<'a> { todo!() } - fn fstat(&mut self, _id: usize, _stat: &mut syscall::Stat) -> syscall::Result> { - todo!() + fn fstat(&mut self, id: usize, _stat: &mut syscall::Stat) -> syscall::Result> { + match self.handles.get_mut(&id).ok_or(Error::new(EBADF))? { + Handle::List { .. } => Ok(Some(0)), + Handle::Disk { .. } | Handle::Partition { .. } => todo!(), + } } fn dup(&mut self, _old_id: usize, _buf: &[u8]) -> Result> {