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

config: make seccomp policy dir default consistent

Browse source 
Re-add a serde default function for JailConfig::seccomp_policy_dir and
use it in the Default impl as well.

Fixes tests when --features=chromeos is enabled.

BUG=b:235858187
TEST=FEATURES=test emerge-hatch crosvm

Change-Id: Iec9152781f098aab05336e794d6eaf3c1105d53b
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3887347
Commit-Queue: Zihan Chen <zihanchen@google.com>
Reviewed-by: Zihan Chen <zihanchen@google.com>
Auto-Submit: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Daniel Verkamp 2022-09-09 10:56:00 -07:00 committed by crosvm LUCI
parent 9df15d5384
commit 2f774a9a6a
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/crosvm/config.rs
View file

@ -63,8 +63,6 @@ cfg_if::cfg_if! {
static KVM_PATH: &str = "/dev/kvm";
static VHOST_NET_PATH: &str = "/dev/vhost-net";
#[cfg(feature="chromeos")]
static SECCOMP_POLICY_DIR: &str = "/usr/share/policy/crosvm";
} else if #[cfg(windows)] {
use base::{Event, Tube};
@ -534,12 +532,22 @@ fn jail_config_default_pivot_root() -> PathBuf {
PathBuf::from(option_env!("DEFAULT_PIVOT_ROOT").unwrap_or("/var/empty"))
}
#[cfg(unix)]
fn jail_config_default_seccomp_policy_dir() -> Option<PathBuf> {
if cfg!(feature = "chromeos") {
Some(PathBuf::from("/usr/share/policy/crosvm"))
} else {
None
}
}
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, serde_keyvalue::FromKeyValues)]
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
pub struct JailConfig {
#[serde(default = "jail_config_default_pivot_root")]
pub pivot_root: PathBuf,
#[cfg(unix)]
#[serde(default = "jail_config_default_seccomp_policy_dir")]
pub seccomp_policy_dir: Option<PathBuf>,
#[serde(default)]
pub seccomp_log_failures: bool,
@ -549,10 +557,8 @@ impl Default for JailConfig {
fn default() -> Self {
JailConfig {
pivot_root: jail_config_default_pivot_root(),
#[cfg(feature = "chromeos")]
seccomp_policy_dir: Some(PathBuf::from(SECCOMP_POLICY_DIR)),
#[cfg(all(unix, not(feature = "chromeos")))]
seccomp_policy_dir: None,
#[cfg(unix)]
seccomp_policy_dir: jail_config_default_seccomp_policy_dir(),
seccomp_log_failures: false,
}
}
@ -2167,7 +2173,7 @@ mod tests {
JailConfig {
pivot_root: jail_config_default_pivot_root(),
#[cfg(feature = "chromeos")]
seccomp_policy_dir: Some(PathBuf::from(SECCOMP_POLICY_DIR)),
seccomp_policy_dir: Some(PathBuf::from("/usr/share/policy/crosvm")),
#[cfg(all(unix, not(feature = "chromeos")))]
seccomp_policy_dir: None,
seccomp_log_failures: false,