diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-11 12:10:44 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-11 12:11:29 +0100 |
| commit | 260d97ca25819690ce87bc5af48ab6a4ae0e2e68 (patch) | |
| tree | 140dc1f8f6fa4a177282ddc724a5afc33753d8f0 /pkgs/applications/virtualization/runc | |
| parent | 2b17620d59af1cd85ef352e7b1ab5d7df5e36796 (diff) | |
| download | nixlib-260d97ca25819690ce87bc5af48ab6a4ae0e2e68.tar nixlib-260d97ca25819690ce87bc5af48ab6a4ae0e2e68.tar.gz nixlib-260d97ca25819690ce87bc5af48ab6a4ae0e2e68.tar.bz2 nixlib-260d97ca25819690ce87bc5af48ab6a4ae0e2e68.tar.lz nixlib-260d97ca25819690ce87bc5af48ab6a4ae0e2e68.tar.xz nixlib-260d97ca25819690ce87bc5af48ab6a4ae0e2e68.tar.zst nixlib-260d97ca25819690ce87bc5af48ab6a4ae0e2e68.zip | |
runc: add patches to fix CVE-2016-9962
Diffstat (limited to 'pkgs/applications/virtualization/runc')
| -rw-r--r-- | pkgs/applications/virtualization/runc/default.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 432c1fdb9648..7f19121b7f5b 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, go-md2man +{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: with lib; @@ -14,6 +14,21 @@ stdenv.mkDerivation rec { sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk"; }; + patches = [ + # Two patches to fix CVE-2016-9962 + # From https://bugzilla.suse.com/show_bug.cgi?id=1012568 + (fetchpatch { + name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch"; + url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw"; + sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck"; + }) + (fetchpatch { + name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch"; + url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw"; + sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl"; + }) + ]; + outputs = [ "out" "man" ]; hardeningDisable = ["fortify"]; |