From e965e10c32c0f26238d3eb9d4234047c51b64ab9 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 15 Sep 2022 11:48:55 -0700 Subject: [PATCH] tests/int: do not set inheritable capabilities Amends commit 98fe566c527479195ce3c ("runc: do not set inheritable capabilities"). Signed-off-by: Kir Kolyshkin --- tests/integration/dev.bats | 3 --- tests/integration/update.bats | 1 - 2 files changed, 4 deletions(-) diff --git a/tests/integration/dev.bats b/tests/integration/dev.bats index 6d9723350..9da472d1a 100644 --- a/tests/integration/dev.bats +++ b/tests/integration/dev.bats @@ -40,7 +40,6 @@ function teardown() { | .linux.devices = [{"path": "/dev/kmsg", "type": "c", "major": 1, "minor": 11}] | .process.capabilities.bounding += ["CAP_SYSLOG"] | .process.capabilities.effective += ["CAP_SYSLOG"] - | .process.capabilities.inheritable += ["CAP_SYSLOG"] | .process.capabilities.permitted += ["CAP_SYSLOG"] | .process.args |= ["sh"]' @@ -78,7 +77,6 @@ function teardown() { | .process.args |= ["sh"] | .process.capabilities.bounding += ["CAP_SYSLOG"] | .process.capabilities.effective += ["CAP_SYSLOG"] - | .process.capabilities.inheritable += ["CAP_SYSLOG"] | .process.capabilities.permitted += ["CAP_SYSLOG"] | .hostname = "myhostname"' @@ -114,7 +112,6 @@ function teardown() { | .process.args |= ["sh"] | .process.capabilities.bounding += ["CAP_MKNOD"] | .process.capabilities.effective += ["CAP_MKNOD"] - | .process.capabilities.inheritable += ["CAP_MKNOD"] | .process.capabilities.permitted += ["CAP_MKNOD"]' runc run -d --console-socket "$CONSOLE_SOCKET" test_allow_block diff --git a/tests/integration/update.bats b/tests/integration/update.bats index b28105809..1937006fd 100644 --- a/tests/integration/update.bats +++ b/tests/integration/update.bats @@ -642,7 +642,6 @@ EOF | .linux.devices = [{"path": "/dev/kmsg", "type": "c", "major": 1, "minor": 11}] | .process.capabilities.bounding += ["CAP_SYSLOG"] | .process.capabilities.effective += ["CAP_SYSLOG"] - | .process.capabilities.inheritable += ["CAP_SYSLOG"] | .process.capabilities.permitted += ["CAP_SYSLOG"] | .process.args |= ["sh", "-c", "while true; do head -c 100 /dev/kmsg 2> /dev/null; done"]'