New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update hcsshim to v0.6.10 #36985
Update hcsshim to v0.6.10 #36985
Conversation
Signed-off-by: Darren Stahl <darst@microsoft.com>
This change only affects code that compiles on Windows so the other CI failures can be ignored. I'll restart them anyway, but they shouldn't matter. This is also been tested by Docker Inc and Microsoft internally. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. @johnstep PTAL
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The previous PR (#36938) did not have a test case, will that be included as part of this one?
@thaJeztah TL;DR No. This is already in EE. Others are free to add test cases if they have time. Resources are limited. This fixes a CVE plus a reported bug, both of which have been verified by both MS and Docker Inc independently. If there needs to be a follow-up PR for tests, that should not block this PR. |
@carlfischer1 FYI |
Codecov Report
@@ Coverage Diff @@
## master #36985 +/- ##
=========================================
Coverage ? 35.38%
=========================================
Files ? 614
Lines ? 45736
Branches ? 0
=========================================
Hits ? 16183
Misses ? 27414
Partials ? 2139 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I found and fixed a separate bug (see microsoft/hcsshim#169) and also wrote an integration test that covers that issue, plus checks that $Recycle.Bin
is not committed, and that files are not missing. After this PR is merged, I will vendor hcsshim v0.6.11 into my test branch and open a moby PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Could we please also get a new preview version (like |
@thaJeztah Could you please tell us if the new release of "18.03.1-ee-1 (2018-06-27)" includes hcsshim v0.6.11 or at least v0.6.10? |
@mback2k yes; all current versions of Docker (EE, CE) have the fix in place |
- What I did
Update hcsshim to v0.6.10 which includes security fixes to address CVE-2018-8115
- Description for the changelog
Security: Change to address CVE-2018-8115
(Addition by @jhowardmsft): Replaces #36938 which vendored v0.6.9. Hence also: Fixes docker/for-win#1947. Fixes #36919 where files are in certain circumstances omitted from layers on commit during a build step on Windows. See microsoft/hcsshim#165 for more detail.
@carlfischer1 Both fixes should probably should be backported.