Skip to content
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.

Sign up for GitHub

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

Jump to bottom

containerd: 1.4.2 -> 1.4.3 #105595

Merged
merged 1 commit into from Dec 1, 2020
Merged

containerd: 1.4.2 -> 1.4.3 #105595

merged 1 commit into from Dec 1, 2020

Conversation

mweinelt
Copy link
Member

@mweinelt mweinelt commented Dec 1, 2020 •
edited

Motivation for this change

Access controls for the shim’s API socket verified that the connecting
process had an effective UID of 0, but did not otherwise restrict
access to the abstract Unix domain socket. This would allow malicious
containers running in the same network namespace as the shim, with an
effective UID of 0 but otherwise reduced privileges, to cause new
processes to be run with elevated privileges.

Fixes: CVE-2020-15257

https://www.openwall.com/lists/oss-security/2020/11/30/6
GHSA-36xw-fx78-c5r4

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mweinelt
containerd: 1.4.2 -> 1.4.3
8884729 
Access controls for the shim’s API socket verified that the connecting
process had an effective UID of 0, but did not otherwise restrict
access to the abstract Unix domain socket. This would allow malicious
containers running in the same network namespace as the shim, with an
effective UID of 0 but otherwise reduced privileges, to cause new
processes to be run with elevated privileges.

Fixes: CVE-2020-15257
@mweinelt mweinelt added 1.severity: security 9.needs: port to stable A PR needs a backport to the stable release. labels Dec 1, 2020
vdemeester
vdemeester approved these changes Dec 1, 2020
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

@mweinelt mweinelt merged commit 8cbe731 into NixOS:master Dec 1, 2020
@mweinelt mweinelt deleted the containerd branch December 1, 2020 17:37
RaghavSood
RaghavSood reviewed Dec 1, 2020
View reviewed changes
pkgs/applications/virtualization/containerd/default.nix
@@ -4,15 +4,15 @@ with lib;

buildGoPackage rec {
pname = "containerd";
version = "1.4.2";
version = "1.4.3";
# git commit for the above version's tag
commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429";
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be changed if the version is changing?

If this is unused, should be removed

Copy link
Member Author

@mweinelt mweinelt Dec 1, 2020 •
edited

Choose a reason for hiding this comment

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

This is passed into buildFlags, so yeah, this probably should've been updated. Will push a fix asap.

❯ ./bin/containerd -v
containerd github.com/containerd/containerd v1.4.3 7ad184331fa3e55e52b890ea95e65ba581ae3429

This is clearly wrong now.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed in 2d55b8d

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 105595 run on x86_64-linux 1

14 packages built:
  • charliecloud
  • containerd
  • disnix
  • disnixos
  • docker (docker-edge ,docker_19_03)
  • docker-gc
  • docker_18_09
  • dydisnix
  • dysnomia
  • out-of-tree
  • pipework
  • python37Packages.jupyter-repo2docker
  • python38Packages.jupyter-repo2docker
  • python39Packages.jupyter-repo2docker

1 similar comment
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 105595 run on x86_64-linux 1

14 packages built:
  • charliecloud
  • containerd
  • disnix
  • disnixos
  • docker (docker-edge ,docker_19_03)
  • docker-gc
  • docker_18_09
  • dydisnix
  • dysnomia
  • out-of-tree
  • pipework
  • python37Packages.jupyter-repo2docker
  • python38Packages.jupyter-repo2docker
  • python39Packages.jupyter-repo2docker

@erictapen
Copy link
Member

Was backported in 3276ff5.

@erictapen erictapen added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Jan 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaghavSood RaghavSood RaghavSood left review comments

@vdemeester vdemeester vdemeester approved these changes

@lukegb lukegb lukegb approved these changes

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

Assignees
No one assigned
Labels
1.severity: security 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@mweinelt @SuperSandro2000 @erictapen @vdemeester @lukegb @RaghavSood