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

vm-migration, vmm: Remove unsafe code when setting socket options

Browse Source 
The introduced `TcpStream` accessor allows setting socket options on the
`TcpStream` without going through the file descriptor and unsafe
methods.

On-behalf-of: SAP julian.schindel@sap.com
Signed-off-by: Julian Schindel <julian.schindel@cyberus-technology.de>
This commit is contained in:
Julian Schindel
2026-07-28 15:57:09 +02:00
committed by Rob Bradford
parent 53ee9ebb77
commit ec68508a2a
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vm-migration/src/tls.rs
View File

@@ -216,6 +216,14 @@ impl TlsStream {
/// from growing without bound.
const BUF_SIZE: usize = 64 /* KiB */ << 10;
/// Returns a reference to the underlying [`TcpStream`].
pub fn tcp_stream(&self) -> &TcpStream {
match &self.stream {
TlsStreamParticipant::Client(stream) => stream.get_ref(),
TlsStreamParticipant::Server(stream) => stream.get_ref(),
}
}
/// Creates a client [`TlsStream`].
///
/// The client verifies the server certificate against `ca-cert.pem` and the

24
vmm/src/migration/transport.rs
View File

@@ -6,15 +6,15 @@
use std::io::{self, ErrorKind, Read, Write};
use std::net::{TcpListener, TcpStream};
use std::num::{NonZeroU32, ParseIntError};
use std::os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd};
use std::os::fd::{AsFd, AsRawFd, BorrowedFd};
use std::os::unix::net::{UnixListener, UnixStream};
use std::path::{Path, PathBuf};
use std::result::Result;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::{Receiver, Sender, SyncSender, TrySendError, channel, sync_channel};
use std::sync::{Arc, Mutex};
use std::thread;
use std::time::Duration;
use std::{mem, thread};
use anyhow::{Context, anyhow};
use log::{debug, error, info, warn};
@@ -166,15 +166,7 @@ impl SocketStream {
match self {
SocketStream::Unix(s) => s.set_read_timeout(dur),
SocketStream::Tcp(s) => s.set_read_timeout(dur),
SocketStream::Tls(s) => {
let fd = s.as_fd().as_raw_fd();
// SAFETY: fd is borrowed from the TLS stream and forgotten
// immediately. The TLS stream retains ownership.
let tcp = unsafe { TcpStream::from_raw_fd(fd) };
let r = tcp.set_read_timeout(dur);
mem::forget(tcp);
r
}
SocketStream::Tls(s) => s.tcp_stream().set_read_timeout(dur),
}
}
@@ -182,15 +174,7 @@ impl SocketStream {
match self {
SocketStream::Unix(_) => Ok(()),
SocketStream::Tcp(s) => s.set_nodelay(nodelay),
SocketStream::Tls(s) => {
let fd = s.as_fd().as_raw_fd();
// SAFETY: fd is borrowed from the TLS stream and forgotten
// immediately. The TLS stream retains ownership.
let tcp = unsafe { TcpStream::from_raw_fd(fd) };
let r = tcp.set_nodelay(nodelay);
mem::forget(tcp);
r
}
SocketStream::Tls(s) => s.tcp_stream().set_nodelay(nodelay),
}
}
}