kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: console: Handle input queue errors gracefully

Browse Source 
Address translation or guest memory write failures on the receiveq
propagated errors that killed the console device thread. Log a
warning and break out of the descriptor loop instead.

Also fix a data-loss bug: bytes were drained from the input buffer
before the write to guest memory, so a failed write would silently
discard the data. Copy first, write, then drain only on success.

Signed-off-by: Rob Bradford <rbradford@meta.com>
Assisted-by: Claude:claude-opus-4-6
This commit is contained in:
Rob Bradford
2026-05-06 15:08:48 +01:00
parent 48123669b5
commit 4725a997cc
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
virtio-devices/src/console.rs
View File

@@ -53,8 +53,6 @@ const VIRTIO_CONSOLE_F_SIZE: u64 = 0;
enum Error {
#[error("Failed to read from guest memory")]
GuestMemoryRead(#[source] vm_memory::guest_memory::Error),
#[error("Failed to write to guest memory")]
GuestMemoryWrite(#[source] vm_memory::guest_memory::Error),
#[error("Failed to write_all output")]
OutputWriteAll(#[source] io::Error),
#[error("Failed to flush output")]
@@ -217,22 +215,24 @@ impl ConsoleEpollHandler {
warn!("Skipping device-readable descriptor on receiveq");
continue;
}
let len = cmp::min(desc.len(), in_buffer.len() as u32);
let source_slice = in_buffer.drain(..len as usize).collect::<Vec<u8>>();
desc_chain
.memory()
.write_slice(
&source_slice[..],
desc.addr()
.translate_gva(self.access_platform.as_deref(), desc.len() as usize)
.map_err(|e| {
Error::GuestMemoryWrite(vm_memory::GuestMemoryError::IOError(e))
})?,
)
.map_err(Error::GuestMemoryWrite)?;
total_len += len;
let len = cmp::min(desc.len() as usize, in_buffer.len());
let addr = match desc
.addr()
.translate_gva(self.access_platform.as_deref(), desc.len() as usize)
{
Ok(a) => a,
Err(e) => {
warn!("Failed to translate receiveq descriptor address: {e}");
break;
}
};
let source: Vec<u8> = in_buffer.range(..len).copied().collect();
if let Err(e) = desc_chain.memory().write_slice(&source, addr) {
warn!("Failed to write to receiveq descriptor: {e}");
break;
}
in_buffer.drain(..len);
total_len += len as u32;
}
recv_queue