devices: remove unwraps that may cause panic

Calls of `pop_uses()` and `add()` method of `VirtQueue` may get error result. These errors should be correctly handled rather than unwrapped. Signed-off-by: Jiaqi Gao <[email protected]>
intel · Sep 15, 2023 · a47045f · a47045f
1 parent 1d28c48
commit a47045f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/devices/virtio_serial/src/lib.rs b/src/devices/virtio_serial/src/lib.rs
@@ -644,7 +644,7 @@ impl VirtioSerial {
 
             let vq = self.queues.index(CONTROL_RECEIVEQ as usize);
             // A buffer chain contains a packet header buffer and a data buffer
-            vq.borrow_mut().add(&[], &h2g).unwrap();
+            vq.borrow_mut().add(&[], &h2g)?;
 
             self.receive_queues_prefill[CONTROL_RECEIVEQ as usize / 2] += 1;
         }
@@ -674,8 +674,7 @@ impl VirtioSerial {
             self.queues
                 .index(queue_idx as usize)
                 .borrow_mut()
-                .add(&[], &h2g)
-                .unwrap();
+                .add(&[], &h2g)?;
 
             prefill_nr += 1;
         }

diff --git a/src/devices/vsock/src/transport/virtio_pci.rs b/src/devices/vsock/src/transport/virtio_pci.rs
@@ -178,7 +178,7 @@ impl VirtioVsock {
         let mut g2h = Vec::new();
         let mut h2g = Vec::new();
 
-        let _ = self.rx.borrow_mut().pop_used(&mut g2h, &mut h2g).unwrap();
+        let _ = self.rx.borrow_mut().pop_used(&mut g2h, &mut h2g)?;
         if h2g.len() != 2 {
             self.rx_buf_num -= h2g.len();
             return Err(VsockTransportError::InvalidVsockPacket);
@@ -282,7 +282,7 @@ impl VirtioVsock {
             ];
 
             // A buffer chain contains a packet header buffer and a data buffer
-            self.rx.get_mut().add(&[], &h2g).unwrap();
+            self.rx.get_mut().add(&[], &h2g)?;
 
             self.rx_buf_num += 2;
         }
@@ -383,7 +383,7 @@ impl VsockTransport for VirtioVsock {
 
         let mut g2h = Vec::new();
         let mut h2g = Vec::new();
-        let _ = self.tx.borrow_mut().pop_used(&mut g2h, &mut h2g).unwrap();
+        let _ = self.tx.borrow_mut().pop_used(&mut g2h, &mut h2g)?;
 
         for vq_buf in &g2h {
             self.free_dma_memory(vq_buf.addr)