Skip to content

Update hcsshim to v0.6.10 - #36985

Merged
thaJeztah merged 1 commit into
moby:masterfrom
darstahl:revendorHcsshim
May 3, 2018
Merged

Update hcsshim to v0.6.10#36985
thaJeztah merged 1 commit into
moby:masterfrom
darstahl:revendorHcsshim

Conversation

@darstahl

@darstahl darstahl commented May 2, 2018

Copy link
Copy Markdown
Contributor

- 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.

Signed-off-by: Darren Stahl <darst@microsoft.com>
@darstahl

darstahl commented May 2, 2018

Copy link
Copy Markdown
Contributor Author

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.

@lowenna lowenna left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. @johnstep PTAL

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

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?

@lowenna

lowenna commented May 3, 2018

Copy link
Copy Markdown
Member

@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.

@lowenna

lowenna commented May 3, 2018

Copy link
Copy Markdown
Member

@carlfischer1 FYI

@codecov

codecov Bot commented May 3, 2018

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@51a9119). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #36985   +/-   ##
=========================================
  Coverage          ?   35.38%           
=========================================
  Files             ?      614           
  Lines             ?    45736           
  Branches          ?        0           
=========================================
  Hits              ?    16183           
  Misses            ?    27414           
  Partials          ?     2139

@johnstep johnstep left a comment

Copy link
Copy Markdown
Member

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.

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@thaJeztah
thaJeztah merged commit e890301 into moby:master May 3, 2018
@mback2k

mback2k commented May 7, 2018

Copy link
Copy Markdown

Could we please also get a new preview version (like 17.10.0-ee-preview-3) with these bugfixes? I have to spent hours of building docker images locally and uploading them to my Windows Server 1709. Waiting for more than 1 hour between each test run due to slow build and upload time locally is very annoying. It would be very appreciated.

@darstahl
darstahl deleted the revendorHcsshim branch May 9, 2018 22:52
@mback2k

mback2k commented Jun 28, 2018

Copy link
Copy Markdown

@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?

@thaJeztah

Copy link
Copy Markdown
Member

@mback2k yes; all current versions of Docker (EE, CE) have the fix in place

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Docker for Windows does not persist some files Layers go missing between RUN statements

6 participants