github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-07 11:04:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1844 from lifupan/main

Browse Source 
rustjail: separated the propagation flags from mount flags
This commit is contained in:
Peng Tao 2021-05-14 10:25:35 +08:00 committed by GitHub
commit f6c5f7c0ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/agent/rustjail/src/mount.rs
View File

@ -68,6 +68,8 @@ lazy_static! {
m.insert("rprivate", MsFlags::MS_PRIVATE | MsFlags::MS_REC); m.insert("rprivate", MsFlags::MS_PRIVATE | MsFlags::MS_REC);
m.insert("slave", MsFlags::MS_SLAVE); m.insert("slave", MsFlags::MS_SLAVE);
m.insert("rslave", MsFlags::MS_SLAVE | MsFlags::MS_REC); m.insert("rslave", MsFlags::MS_SLAVE | MsFlags::MS_REC);
m.insert("unbindable", MsFlags::MS_UNBINDABLE);
m.insert("runbindable", MsFlags::MS_UNBINDABLE | MsFlags::MS_REC);
m m
}; };
static ref OPTIONS: HashMap<&'static str, (bool, MsFlags)> = { static ref OPTIONS: HashMap<&'static str, (bool, MsFlags)> = {
@ -93,17 +95,6 @@ lazy_static! {
m.insert("nodiratime", (false, MsFlags::MS_NODIRATIME)); m.insert("nodiratime", (false, MsFlags::MS_NODIRATIME));
m.insert("bind", (false, MsFlags::MS_BIND)); m.insert("bind", (false, MsFlags::MS_BIND));
m.insert("rbind", (false, MsFlags::MS_BIND | MsFlags::MS_REC)); m.insert("rbind", (false, MsFlags::MS_BIND | MsFlags::MS_REC));
m.insert("unbindable", (false, MsFlags::MS_UNBINDABLE));
m.insert(
"runbindable",
(false, MsFlags::MS_UNBINDABLE | MsFlags::MS_REC),
);
m.insert("private", (false, MsFlags::MS_PRIVATE));
m.insert("rprivate", (false, MsFlags::MS_PRIVATE | MsFlags::MS_REC));
m.insert("shared", (false, MsFlags::MS_SHARED));
m.insert("rshared", (false, MsFlags::MS_SHARED | MsFlags::MS_REC));
m.insert("slave", (false, MsFlags::MS_SLAVE));
m.insert("rslave", (false, MsFlags::MS_SLAVE | MsFlags::MS_REC));
m.insert("relatime", (false, MsFlags::MS_RELATIME)); m.insert("relatime", (false, MsFlags::MS_RELATIME));
m.insert("norelatime", (true, MsFlags::MS_RELATIME)); m.insert("norelatime", (true, MsFlags::MS_RELATIME));
m.insert("strictatime", (false, MsFlags::MS_STRICTATIME)); m.insert("strictatime", (false, MsFlags::MS_STRICTATIME));
@ -192,7 +183,7 @@ pub fn init_rootfs(
let mut bind_mount_dev = false; let mut bind_mount_dev = false;
for m in &spec.mounts { for m in &spec.mounts {
let (mut flags, data) = parse_mount(&m); let (mut flags, pgflags, data) = parse_mount(&m);
if !m.destination.starts_with('/') || m.destination.contains("..") { if !m.destination.starts_with('/') || m.destination.contains("..") {
return Err(anyhow!( return Err(anyhow!(
"the mount destination {} is invalid", "the mount destination {} is invalid",
@ -234,13 +225,15 @@ pub fn init_rootfs(
// effective. // effective.
// first check that we have non-default options required before attempting a // first check that we have non-default options required before attempting a
// remount // remount
if m.r#type == "bind" { if m.r#type == "bind" && !pgflags.is_empty() {
for o in &m.options {
if let Some(fl) = PROPAGATION.get(o.as_str()) {
let dest = secure_join(rootfs, &m.destination); let dest = secure_join(rootfs, &m.destination);
mount(None::<&str>, dest.as_str(), None::<&str>, *fl, None::<&str>)?; mount(
} None::<&str>,
} dest.as_str(),
None::<&str>,
pgflags,
None::<&str>,
)?;
} }
} }
} }
@ -657,26 +650,27 @@ pub fn ms_move_root(rootfs: &str) -> Result<bool> {
Ok(true) Ok(true)
} }
fn parse_mount(m: &Mount) -> (MsFlags, String) { fn parse_mount(m: &Mount) -> (MsFlags, MsFlags, String) {
let mut flags = MsFlags::empty(); let mut flags = MsFlags::empty();
let mut pgflags = MsFlags::empty();
let mut data = Vec::new(); let mut data = Vec::new();
for o in &m.options { for o in &m.options {
match OPTIONS.get(o.as_str()) { if let Some(v) = OPTIONS.get(o.as_str()) {
Some(v) => {
let (clear, fl) = *v; let (clear, fl) = *v;
if clear { if clear {
flags &= !fl; flags &= !fl;
} else { } else {
flags |= fl; flags |= fl;
} }
} } else if let Some(fl) = PROPAGATION.get(o.as_str()) {
pgflags |= *fl;
None => data.push(o.clone()), } else {
data.push(o.clone());
} }
} }
(flags, data.join(",")) (flags, pgflags, data.join(","))
} }
// This function constructs a canonicalized path by combining the `rootfs` and `unsafe_path` elements. // This function constructs a canonicalized path by combining the `rootfs` and `unsafe_path` elements.
@ -922,7 +916,7 @@ pub fn finish_rootfs(cfd_log: RawFd, spec: &Spec) -> Result<()> {
for m in spec.mounts.iter() { for m in spec.mounts.iter() {
if m.destination == "/dev" { if m.destination == "/dev" {
let (flags, _) = parse_mount(m); let (flags, _, _) = parse_mount(m);
if flags.contains(MsFlags::MS_RDONLY) { if flags.contains(MsFlags::MS_RDONLY) {
mount( mount(
Some("/dev"), Some("/dev"),