diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-12-28 21:04:51 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2016-12-28 21:04:51 -0500 |
| commit | f5ca9a4212630059a9e113c41e29c497fbbcd0f9 (patch) | |
| tree | 43eca22404135a2681f8d0fd48fbed21365a2fbf /pkgs/applications | |
| parent | 3fcdbedbef35e0d01e09af832c5636382dfd2450 (diff) | |
| parent | 8f4098f0873c3ee4368fddb56d88fb95d39b5b14 (diff) | |
| download | nixlib-f5ca9a4212630059a9e113c41e29c497fbbcd0f9.tar nixlib-f5ca9a4212630059a9e113c41e29c497fbbcd0f9.tar.gz nixlib-f5ca9a4212630059a9e113c41e29c497fbbcd0f9.tar.bz2 nixlib-f5ca9a4212630059a9e113c41e29c497fbbcd0f9.tar.lz nixlib-f5ca9a4212630059a9e113c41e29c497fbbcd0f9.tar.xz nixlib-f5ca9a4212630059a9e113c41e29c497fbbcd0f9.tar.zst nixlib-f5ca9a4212630059a9e113c41e29c497fbbcd0f9.zip | |
Merge branch 'roundup-15'
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a99b37f0d17d..eb1672101263 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -137,6 +137,17 @@ stdenv.mkDerivation rec { # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06 ./CVE-2016-9102.patch + + (fetchpatch { + name = "qemu-CVE-2016-9911.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714"; + sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9921_9922.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=commit;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; hardeningDisable = [ "stackprotector" ]; |