summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2016-05-16 10:45:27 +0200
committerAlexander Larsson <alexl@redhat.com>2016-05-16 10:45:27 +0200
commitd1d73bd2b26c14d1f9b5f413472ea497e3c0b07a (patch)
tree6e6224c6f807e4bd538654958a7e9ddda833fcec
parent7cffe7c1b186031ab242ec153b0920e2ea6d15da (diff)
downloadxdg-app-d1d73bd2b26c14d1f9b5f413472ea497e3c0b07a.tar.gz
run: Remove old seccomp arch code
There was a merge error when we switched to bubblewrap, this code was replaced with the code that only adds the target arch, but we forgot to remove this old code.
-rw-r--r--common/flatpak-run.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index b6cc831..b92f24d 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -2582,22 +2582,6 @@ setup_seccomp (GPtrArray *argv_array,
}
}
- /* Add in all possible secondary archs we are aware of that
- * this kernel might support. */
-#if defined(__i386__) || defined(__x86_64__)
- r = seccomp_arch_add (seccomp, SCMP_ARCH_X86);
- if (r < 0 && r != -EEXIST)
- return flatpak_fail (error, "Failed to add x86 architecture to seccomp filter");
-
- r = seccomp_arch_add (seccomp, SCMP_ARCH_X86_64);
- if (r < 0 && r != -EEXIST)
- return flatpak_fail (error, "Failed to add x86_64 architecture to seccomp filter");
-
- r = seccomp_arch_add (seccomp, SCMP_ARCH_X32);
- if (r < 0 && r != -EEXIST)
- return flatpak_fail (error, "Failed to add x32 architecture to seccomp filter");
-#endif
-
/* TODO: Should we filter the kernel keyring syscalls in some way?
* We do want them to be used by desktop apps, but they could also perhaps
* leak system stuff or secrets from other apps.