mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-10 12:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crosvm: unix: Do not keep around a reference to minijail.

Browse source 
minijail object destructor only frees memory regions, we don't need to
keep it around.

BUG=b:238646369
TEST=build.

Change-Id: Ia736d4b6e1ccc4bb476e8fda18981259d271a36f
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3850109
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Junichi Uekawa <uekawa@chromium.org>
Tested-by: Junichi Uekawa <uekawa@chromium.org>
This commit is contained in:
Junichi Uekawa 2022-08-23 19:17:35 +09:00 committed by crosvm LUCI
parent 576d5c5311
commit 9ac7ca65fd
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/crosvm/sys/unix.rs
View file

@ -2784,13 +2784,13 @@ fn run_control<V: VmArch + 'static, Vcpu: VcpuArch + 'static>(
/// The jailing business is nasty and potentially unsafe if done from the wrong context - do not
/// call outside of `start_devices`!
///
/// Returns the jail the device process is running in, as well as its pid.
/// Returns the pid of the jailed device process.
fn jail_and_start_vu_device<T: VirtioDeviceBuilder>(
jail_config: &Option<JailConfig>,
params: &T,
vhost: &str,
name: &str,
) -> anyhow::Result<(Minijail, libc::pid_t, Option<Box<dyn std::any::Any>>)> {
) -> anyhow::Result<(libc::pid_t, Option<Box<dyn std::any::Any>>)> {
let mut keep_rds = Vec::new();
base::syslog::push_descriptors(&mut keep_rds);
@ -2857,7 +2857,7 @@ fn jail_and_start_vu_device<T: VirtioDeviceBuilder>(
// to clean up ourselves.
info!("process for device {} (PID {}) started", &name, pid);
Ok((jail, pid, parent_resources))
Ok((pid, parent_resources))
}
}
}
@ -2866,12 +2866,7 @@ pub fn start_devices(opts: DevicesCommand) -> anyhow::Result<()> {
struct DeviceJailInfo {
// Unique name for the device, in the form `foomatic-0`.
name: String,
// Jail the device process is running in.
// We are just keeping it alive for as long as the device process needs to run.
#[allow(dead_code)]
jail: Minijail,
#[allow(dead_code)]
drop_resources: Option<Box<dyn std::any::Any>>,
_drop_resources: Option<Box<dyn std::any::Any>>,
}
fn add_device<T: VirtioDeviceBuilder>(
@ -2883,15 +2878,14 @@ pub fn start_devices(opts: DevicesCommand) -> anyhow::Result<()> {
) -> anyhow::Result<()> {
let name = format!("{}-{}", T::NAME, i);
let (jail, pid, drop_resources) =
let (pid, _drop_resources) =
jail_and_start_vu_device::<T>(jail_config, device_params, vhost, &name)?;
devices_jails.insert(
pid,
DeviceJailInfo {
name,
jail,
drop_resources,
_drop_resources,
},
);