summary refs log tree commit diff
path: root/src/linux.rs
diff options
context:
space:
mode:
authorChirantan Ekbote <chirantan@chromium.org>2019-11-14 18:45:56 +0900
committerCommit Bot <commit-bot@chromium.org>2019-11-19 17:59:49 +0000
commitb0ac00745a2780b841d5c6590d8dbb0e8b65ba0a (patch)
tree0c91cb528e737b8581e78ac13cf05de5f5601aad /src/linux.rs
parentbd4723b218fab426f575e70df5c0e437bd40669f (diff)
downloadcrosvm-b0ac00745a2780b841d5c6590d8dbb0e8b65ba0a.tar
crosvm-b0ac00745a2780b841d5c6590d8dbb0e8b65ba0a.tar.gz
crosvm-b0ac00745a2780b841d5c6590d8dbb0e8b65ba0a.tar.bz2
crosvm-b0ac00745a2780b841d5c6590d8dbb0e8b65ba0a.tar.lz
crosvm-b0ac00745a2780b841d5c6590d8dbb0e8b65ba0a.tar.xz
crosvm-b0ac00745a2780b841d5c6590d8dbb0e8b65ba0a.tar.zst
crosvm-b0ac00745a2780b841d5c6590d8dbb0e8b65ba0a.zip
Enable seccomp for virtio-fs
Add x86_64 and arm seccomp policy files for the virtio-fs device.

BUG=b:136128319
TEST=Run a vm with a sandboxed virtio-fs device

Change-Id: I8ea7c5d3e90696077f0c2b1f942cb286a0b36cf4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1916559
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Diffstat (limited to 'src/linux.rs')
-rw-r--r--src/linux.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/linux.rs b/src/linux.rs
index fc4c63e..bd6ee5c 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -761,17 +761,16 @@ fn create_fs_device(
 
         j.no_new_privs();
 
-        // TODO(chirantan): Enable seccomp
         // Use TSYNC only for the side effect of it using SECCOMP_RET_TRAP, which will correctly kill
         // the entire device process if a worker thread commits a seccomp violation.
-        // let seccomp_policy = cfg.seccomp_policy_dir.join("9p_device.policy");
-        // j.set_seccomp_filter_tsync();
-        // if cfg.seccomp_log_failures {
-        //     j.log_seccomp_filter_failures();
-        // }
-        // j.parse_seccomp_filters(&seccomp_policy)
-        //     .map_err(Error::DeviceJail)?;
-        // j.use_seccomp_filter();
+        let seccomp_policy = cfg.seccomp_policy_dir.join("fs_device.policy");
+        j.set_seccomp_filter_tsync();
+        if cfg.seccomp_log_failures {
+            j.log_seccomp_filter_failures();
+        }
+        j.parse_seccomp_filters(&seccomp_policy)
+            .map_err(Error::DeviceJail)?;
+        j.use_seccomp_filter();
 
         // Don't do init setup.
         j.run_as_init();