Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03] Update containerd to v1.2.11, runc v1.0.0-rc9 #428

Merged

Conversation

thaJeztah
Copy link
Member

[19.03] Update to runc v1.0.0-rc9

full diff: opencontainers/runc@3e425f8...v1.0.0-rc9

  • Add SCMP_ACT_LOG as a valid Seccomp action opencontainers/runc#1951 Add SCMP_ACT_LOG as a valid Seccomp action

  • *: verify operations on /proc/... are on procfs opencontainers/runc#2130 *: verify operations on /proc/... are on procfs
    This is an additional mitigation for CVE-2019-16884. The primary problem
    is that Docker can be coerced into bind-mounting a file system on top of
    /proc (resulting in label-related writes to /proc no longer happening).

    While we are working on mitigations against permitting the mounts, this
    helps avoid our code from being tricked into writing to non-procfs
    files. This is not a perfect solution (after all, there might be a
    bind-mount of a different procfs file over the target) but in order to
    exploit that you would need to be able to tweak a config.json pretty
    specifically (which thankfully Docker doesn't allow).

    Specifically this stops AppArmor from not labeling a process silently
    due to /proc/self/attr/... being incorrectly set, and stops any
    accidental fd leaks because /proc/self/fd/... is not real.

[19.03] Update containerd binary to v1.2.11

full diff: containerd/containerd@v1.2.10...v1.2.11

The eleventh patch release for containerd 1.2 includes an updated runc with
an additional fix for CVE-2019-16884 and a Golang update.

Notable Updates

CRI fixes:

full diff: opencontainers/runc@3e425f8...v1.0.0-rc9

- opencontainers/runc#1951 Add SCMP_ACT_LOG as a valid Seccomp action
- opencontainers/runc#2130 *: verify operations on /proc/... are on procfs
  This is an additional mitigation for CVE-2019-16884. The primary problem
  is that Docker can be coerced into bind-mounting a file system on top of
  /proc (resulting in label-related writes to /proc no longer happening).

  While we are working on mitigations against permitting the mounts, this
  helps avoid our code from being tricked into writing to non-procfs
  files. This is not a perfect solution (after all, there might be a
  bind-mount of a different procfs file over the target) but in order to
  exploit that you would need to be able to tweak a config.json pretty
  specifically (which thankfully Docker doesn't allow).

  Specifically this stops AppArmor from not labeling a process silently
  due to /proc/self/attr/... being incorrectly set, and stops any
  accidental fd leaks because /proc/self/fd/... is not real.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: containerd/containerd@v1.2.10...v1.2.11

The eleventh patch release for containerd 1.2 includes an updated runc with
an additional fix for CVE-2019-16884 and a Golang update.

Notable Updates
-----------------------

- Update the runc vendor to v1.0.0-rc9 which includes an additional mitigation
  for CVE-2019-16884.
  More details on the runc CVE in opencontainers/runc#2128, and the additional
  mitigations in opencontainers/runc#2130.
- Add local-fs.target to service file to fix corrupt image after unexpected host
  reboot. Reported in containerd/containerd#3671, and fixed by containerd/containerd#3746.
- Update Golang runtime to 1.12.13, which includes security fixes to the crypto/dsa
  package made in Go 1.12.11 (CVE-2019-17596), and fixes to the go command, runtime,
  syscall and net packages (Go 1.12.12).

CRI fixes:
-----------------------

- Fix shim delete error code to avoid unnecessary retries in the CRI plugin. Discovered
  in containerd/cri#1309, and fixed by containerd/containerd#3732 and containerd/containerd#3739.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 19.03.6 milestone Nov 28, 2019
@kervin521
Copy link

apt install docker-ce docker-ce-cli containerd.io

error info:

Reading package lists... Done
Building dependency tree       
Reading state information... Done
Package docker-ce is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source

E: Package 'docker-ce' has no installation candidate
E: Unable to locate package docker-ce-cli
E: Unable to locate package containerd.io
E: Couldn't find any package by glob 'containerd.io'
E: Couldn't find any package by regex 'containerd.io'


Copy link

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@kolyshkin kolyshkin left a comment

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 c4dbf36 into docker-archive:19.03 Jan 16, 2020
@thaJeztah thaJeztah deleted the 19.03_bump_containerd_1.2.11 branch January 16, 2020 19:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants