35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 4c34815784e9ffda5733225c7d95824f96375e36 Mon Sep 17 00:00:00 2001
|
|
From: Simon McVittie <smcv@collabora.com>
|
|
Date: Wed, 1 Sep 2021 14:19:31 +0100
|
|
Subject: [PATCH] run: Block setns()
|
|
|
|
If we don't allow unshare() or clone() with CLONE_NEWUSER, we also
|
|
shouldn't allow joining an existing (but different) namespace.
|
|
|
|
Partially fixes GHSA-67h7-w3jq-vh4q.
|
|
|
|
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/flatpak/flatpak/commit/4c34815784e9ffda5733225c7d95824f96375e36
|
|
|
|
---
|
|
common/flatpak-run.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
|
|
index 0fbd5a9..458e3c3 100644
|
|
--- a/common/flatpak-run.c
|
|
+++ b/common/flatpak-run.c
|
|
@@ -2133,6 +2133,7 @@ setup_seccomp (FlatpakBwrap *bwrap,
|
|
|
|
/* Don't allow subnamespace setups: */
|
|
{SCMP_SYS (unshare), EPERM},
|
|
+ {SCMP_SYS (setns), EPERM},
|
|
{SCMP_SYS (mount), EPERM},
|
|
{SCMP_SYS (pivot_root), EPERM},
|
|
{SCMP_SYS (clone), EPERM, &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)},
|
|
--
|
|
2.19.1
|
|
|