Whitelisting adjtimex get time operation and requiring CAP_SYS_TIME only in case of adjustment#33403
Merged
tonistiigi merged 1 commit intomoby:masterfrom Jun 17, 2017
Conversation
Member
|
@szegedim run |
thaJeztah
added
the
status/failing-ci
…CAP_SYS_TIME Signed-off-by: Miklos Szegedi <[email protected]>
miklosszegedi
force-pushed
the
33126-whitelist-adjtimex
branch
from
2a5076d to
2db0531
Compare
Author
|
@tonistiigi I updated the patch. |
Author
|
The issues seem to be environment related. |
tonistiigi
added
rebuild/experimental
and removed
status/failing-ci
Member
|
@justincormack PTAL |
Member
|
LGTM |
runcom
approved these changes
Jun 3, 2017
GordonTheTurtle
added
the
dco/no
|
Please sign your commits following these rules: $ git clone -b "33126-whitelist-adjtimex" [email protected]:szegedim/moby.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354184424
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
Contributor
|
LGTM
…On 15 Jun 2017 5:58 pm, "Gordon" ***@***.***> wrote:
Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:
$ git clone -b "33126-whitelist-adjtimex" ***@***.***:szegedim/moby.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354184424editor openschange each 'pick' to 'edit'save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f
Amending updates the existing PR. You *DO NOT* need to open a new one.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#33403 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAdcPHvv6l95wxyUHYyT7EMgIS9SzFNtks5sEdNDgaJpZM4NnDWN>
.
|
Member
|
@szegedim can you rebase to get rid of the merge commit? That should also fix the DCO sign-off failure |
miklosszegedi
force-pushed
the
33126-whitelist-adjtimex
branch
from
fa8ca20 to
2db0531
Compare
GordonTheTurtle
removed
the
dco/no
Author
|
I do not have permissions to merge. Could you do that? |
Member
|
LGTM |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.
…
Signed-off-by: Miklos Szegedi [email protected]
- What I did
Fixes #33126 . Enabled getting the time without CAP_SYS_TIME
- How I did it
Enabled adjtimex in the default profile without requiring CAP_SYS_TIME privilege. The kernel will check CAP_SYS_TIME and won't allow setting the time.
- How to verify it
docker run -t -i centos:7
yum install -y ntp
ntptime
Returns: ntp_gettime() returns code 0 (OK)
ntpdate -v time.nist.gov
Returns: ntpdate[84]: Can't adjust the time of day: Operation not permitted
- Description for the changelog
Whitelisting adjtimex get time operation and requiring CAP_SYS_TIME only in case of adjustment