Fix panic in TestExecSetPlatformOpt, TestExecSetPlatformOptPrivileged #42181
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thaJeztah
added
area/security/apparmor
status/2-code-review
area/testing
process/cherry-pick
kind/bugfix
Member
Author
|
Failure is unrelated |
1 task
thaJeztah
force-pushed
the
fix_exec_apparmor_test
branch
from
0fd7768 to
4081923
Compare
These tests would panic; - in WithRLimits(), because HostConfig was not set; https://github.com/moby/moby/blob/470ae8422fc6f1845288eb7572253b08f1e6edf8/daemon/oci_linux.go#L46-L47 - in daemon.mergeUlimits(), because daemon.configStore was not set; https://github.com/moby/moby/blob/470ae8422fc6f1845288eb7572253b08f1e6edf8/daemon/oci_linux.go#L1069 This panic was not discovered because the current version of runc/libcontainer that we vendor would not always return false for `apparmor.IsEnabled()` when running docker-in-docker or if `apparmor_parser` is not found. Starting with v1.0.0-rc93 of libcontainer, this is no longer the case (changed in opencontainers/runc@bfb4ea1) This patch; - changes the tests to initialize Daemon.configStore and Container.HostConfig - Combines TestExecSetPlatformOpt and TestExecSetPlatformOptPrivileged into a new test (TestExecSetPlatformOptAppArmor) - Runs the test both if AppArmor is enabled and if not (in which case it tests that the container's AppArmor profile is left empty). - Adds a FIXME comment for a possible bug in execSetPlatformOpts, which currently prefers custom profiles over "privileged". Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
fix_exec_apparmor_test
branch
from
4081923 to
6d1eceb
Compare
Member
Author
|
@AkihiroSuda @cpuguy83 ptal |
tonistiigi
approved these changes
Apr 29, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Splitting this from #42143, where I found this issue
These tests would panic;
WithRLimits(), because HostConfig was not set;moby/daemon/oci_linux.go
Lines 46 to 47 in 470ae84
daemon.mergeUlimits(), because daemon.configStore was not set;moby/daemon/oci_linux.go
Line 1069 in 470ae84
This panic was not discovered because the current version of runc/libcontainer that we vendor
would not always return false for
apparmor.IsEnabled()when running docker-in-docker or ifapparmor_parseris not found. Starting with v1.0.0-rc93 of libcontainer, this is no longerthe case (changed in opencontainers/runc@bfb4ea1)
This patch;
(TestExecSetPlatformOptAppArmor)
that the container's AppArmor profile is left empty).
prefers custom profiles over "privileged".
- A picture of a cute animal (not mandatory but encouraged)