External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: fix vhost-user connection double close

Browse Source 
Closing a file descriptor while the std object representing it still
exists is a violation of the invariants of those APIs.  After
shutdown() returns, the device will be dropped, and because that
object still exists, it will try to close the file descriptor again.
This is unsafe, because the file descriptor number might have been
reused, so an unrelated file descriptor could be unexpectedly closed.

As a result, the following error was being produced if debug
assertions were enabled when shutting down a VM with a vhost-user
device:

	fatal runtime error: IO Safety violation: owned file descriptor already closed

In all cases, the device is dropped shortly after shutdown() is
called, so it shouldn't make any difference to close the descriptor in
shutdown() instead of just letting the file object be dropped when the
device is.  Even when migrating, shutdown() isn't called until after
the snapshot is taken, so it should be fine to wait for drop, though
I'm haven't tested this as I don't know any vhost-user devices that
support VHOST_F_LOG_ALL.

Signed-off-by: Alyssa Ross <hi@alyssa.is>
This commit is contained in:
Alyssa Ross 2024-09-21 11:43:26 +02:00
parent faf11d7e9d
commit 46d2e22e3a
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virtio-devices/src/vhost_user/mod.rs
View File

@ -374,11 +374,6 @@ impl VhostUserCommon {
} }
pub fn shutdown(&mut self) { pub fn shutdown(&mut self) {
if let Some(vu) = &self.vu {
// SAFETY: trivially safe
let _ = unsafe { libc::close(vu.lock().unwrap().socket_handle().as_raw_fd()) };
}
// Remove socket path if needed // Remove socket path if needed
if self.server { if self.server {
let _ = std::fs::remove_file(&self.socket_path); let _ = std::fs::remove_file(&self.socket_path);