This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[18.06] Add /proc/acpi to masked paths #14
Merged
Conversation
This file contains 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
The deafult OCI linux spec in oci/defaults{_linux}.go in Docker/Moby
from 1.11 to current upstream master does not block /proc/acpi pathnames
allowing attackers to modify host's hardware like enabling/disabling
bluetooth or turning up/down keyboard brightness. SELinux prevents all
of this if enabled.
Signed-off-by: Antonio Murdaca <[email protected]>
(cherry picked from commit 569b970)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
|
LGTM! |
n4ss
approved these changes
Jul 6, 2018
|
Janky failed due to issues with hub; docker-library/official-images#4543 (comment) |
|
Power failed on flaky tests; restarting both |
|
Janky only had some flaky tests failing |
|
Ignoring the flakey failures on ppc64le: |
docker-jenkins
pushed a commit
that referenced
this pull request
Aug 22, 2019
Although the Dockerfile builds without it, adding wheel back should save some time ``` 00:45:28 #14 10.70 Building wheels for collected packages: pathspec, pyyaml 00:45:28 #14 10.70 Running setup.py bdist_wheel for pathspec: started 00:45:28 #14 10.88 Running setup.py bdist_wheel for pathspec: finished with status 'error' 00:45:28 #14 10.88 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pathspec/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpg9pl4u6kpip-wheel- --python-tag cp35: 00:45:28 #14 10.88 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 10.88 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 10.88 or: -c --help-commands 00:45:28 #14 10.88 or: -c cmd --help 00:45:28 #14 10.88 00:45:28 #14 10.88 error: invalid command 'bdist_wheel' 00:45:28 #14 10.88 00:45:28 #14 10.88 ---------------------------------------- 00:45:28 #14 10.88 Failed building wheel for pathspec 00:45:28 #14 10.88 Running setup.py clean for pathspec 00:45:28 #14 11.05 Running setup.py bdist_wheel for pyyaml: started 00:45:28 #14 11.25 Running setup.py bdist_wheel for pyyaml: finished with status 'error' 00:45:28 #14 11.25 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pyyaml/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpyci_xi0bpip-wheel- --python-tag cp35: 00:45:28 #14 11.25 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 11.25 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 11.25 or: -c --help-commands 00:45:28 #14 11.25 or: -c cmd --help 00:45:28 #14 11.25 00:45:28 #14 11.25 error: invalid command 'bdist_wheel' 00:45:28 #14 11.25 00:45:28 #14 11.25 ---------------------------------------- 00:45:28 #14 11.25 Failed building wheel for pyyaml 00:45:28 #14 11.25 Running setup.py clean for pyyaml 00:45:28 #14 11.44 Failed to build pathspec pyyaml 00:45:28 #14 11.45 Installing collected packages: pathspec, pyyaml, yamllint 00:45:28 #14 11.45 Running setup.py install for pathspec: started 00:45:29 #14 11.73 Running setup.py install for pathspec: finished with status 'done' 00:45:29 #14 11.73 Running setup.py install for pyyaml: started 00:45:29 #14 12.05 Running setup.py install for pyyaml: finished with status 'done' 00:45:29 #14 12.12 Successfully installed pathspec-0.5.9 pyyaml-5.1.2 yamllint-1.16.0 ``` Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
added a commit
that referenced
this pull request
Sep 6, 2019
Although the Dockerfile builds without it, adding wheel back should save some time ``` 00:45:28 #14 10.70 Building wheels for collected packages: pathspec, pyyaml 00:45:28 #14 10.70 Running setup.py bdist_wheel for pathspec: started 00:45:28 #14 10.88 Running setup.py bdist_wheel for pathspec: finished with status 'error' 00:45:28 #14 10.88 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pathspec/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpg9pl4u6kpip-wheel- --python-tag cp35: 00:45:28 #14 10.88 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 10.88 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 10.88 or: -c --help-commands 00:45:28 #14 10.88 or: -c cmd --help 00:45:28 #14 10.88 00:45:28 #14 10.88 error: invalid command 'bdist_wheel' 00:45:28 #14 10.88 00:45:28 #14 10.88 ---------------------------------------- 00:45:28 #14 10.88 Failed building wheel for pathspec 00:45:28 #14 10.88 Running setup.py clean for pathspec 00:45:28 #14 11.05 Running setup.py bdist_wheel for pyyaml: started 00:45:28 #14 11.25 Running setup.py bdist_wheel for pyyaml: finished with status 'error' 00:45:28 #14 11.25 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pyyaml/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpyci_xi0bpip-wheel- --python-tag cp35: 00:45:28 #14 11.25 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 11.25 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 11.25 or: -c --help-commands 00:45:28 #14 11.25 or: -c cmd --help 00:45:28 #14 11.25 00:45:28 #14 11.25 error: invalid command 'bdist_wheel' 00:45:28 #14 11.25 00:45:28 #14 11.25 ---------------------------------------- 00:45:28 #14 11.25 Failed building wheel for pyyaml 00:45:28 #14 11.25 Running setup.py clean for pyyaml 00:45:28 #14 11.44 Failed to build pathspec pyyaml 00:45:28 #14 11.45 Installing collected packages: pathspec, pyyaml, yamllint 00:45:28 #14 11.45 Running setup.py install for pathspec: started 00:45:29 #14 11.73 Running setup.py install for pathspec: finished with status 'done' 00:45:29 #14 11.73 Running setup.py install for pyyaml: started 00:45:29 #14 12.05 Running setup.py install for pyyaml: finished with status 'done' 00:45:29 #14 12.12 Successfully installed pathspec-0.5.9 pyyaml-5.1.2 yamllint-1.16.0 ``` Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit ad70bf6) Signed-off-by: Sebastiaan van Stijn <[email protected]>
andrewhsu
pushed a commit
that referenced
this pull request
Sep 23, 2019
Although the Dockerfile builds without it, adding wheel back should save some time ``` 00:45:28 #14 10.70 Building wheels for collected packages: pathspec, pyyaml 00:45:28 #14 10.70 Running setup.py bdist_wheel for pathspec: started 00:45:28 #14 10.88 Running setup.py bdist_wheel for pathspec: finished with status 'error' 00:45:28 #14 10.88 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pathspec/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpg9pl4u6kpip-wheel- --python-tag cp35: 00:45:28 #14 10.88 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 10.88 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 10.88 or: -c --help-commands 00:45:28 #14 10.88 or: -c cmd --help 00:45:28 #14 10.88 00:45:28 #14 10.88 error: invalid command 'bdist_wheel' 00:45:28 #14 10.88 00:45:28 #14 10.88 ---------------------------------------- 00:45:28 #14 10.88 Failed building wheel for pathspec 00:45:28 #14 10.88 Running setup.py clean for pathspec 00:45:28 #14 11.05 Running setup.py bdist_wheel for pyyaml: started 00:45:28 #14 11.25 Running setup.py bdist_wheel for pyyaml: finished with status 'error' 00:45:28 #14 11.25 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pyyaml/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpyci_xi0bpip-wheel- --python-tag cp35: 00:45:28 #14 11.25 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 11.25 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 11.25 or: -c --help-commands 00:45:28 #14 11.25 or: -c cmd --help 00:45:28 #14 11.25 00:45:28 #14 11.25 error: invalid command 'bdist_wheel' 00:45:28 #14 11.25 00:45:28 #14 11.25 ---------------------------------------- 00:45:28 #14 11.25 Failed building wheel for pyyaml 00:45:28 #14 11.25 Running setup.py clean for pyyaml 00:45:28 #14 11.44 Failed to build pathspec pyyaml 00:45:28 #14 11.45 Installing collected packages: pathspec, pyyaml, yamllint 00:45:28 #14 11.45 Running setup.py install for pathspec: started 00:45:29 #14 11.73 Running setup.py install for pathspec: finished with status 'done' 00:45:29 #14 11.73 Running setup.py install for pyyaml: started 00:45:29 #14 12.05 Running setup.py install for pyyaml: finished with status 'done' 00:45:29 #14 12.12 Successfully installed pathspec-0.5.9 pyyaml-5.1.2 yamllint-1.16.0 ``` Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit ad70bf6) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The deafult OCI linux spec in oci/defaults{_linux}.go in Docker/Moby
from 1.11 to current upstream master does not block /proc/acpi pathnames
allowing attackers to modify host's hardware like enabling/disabling
bluetooth or turning up/down keyboard brightness. SELinux prevents all
of this if enabled.
Fix for CVE-2018-10892
cherry-pick of moby#37404 for 18.06 (no conflicts)