summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorAntoine Eiche <lewo@abesis.fr>2016-12-29 00:47:38 +0100
committerGraham Christensen <graham@grahamc.com>2016-12-28 20:37:00 -0500
commitbc63738c6f5fa0e8da611a1035cea251f99c13fc (patch)
tree9447703d70a11b44a5b5b0da27f41b6487e7e349 /pkgs/applications
parenta5dd31120873ece433de07683fc48646568f877e (diff)
downloadnixlib-bc63738c6f5fa0e8da611a1035cea251f99c13fc.tar
nixlib-bc63738c6f5fa0e8da611a1035cea251f99c13fc.tar.gz
nixlib-bc63738c6f5fa0e8da611a1035cea251f99c13fc.tar.bz2
nixlib-bc63738c6f5fa0e8da611a1035cea251f99c13fc.tar.lz
nixlib-bc63738c6f5fa0e8da611a1035cea251f99c13fc.tar.xz
nixlib-bc63738c6f5fa0e8da611a1035cea251f99c13fc.tar.zst
nixlib-bc63738c6f5fa0e8da611a1035cea251f99c13fc.zip
qemu: fix CVE-2016-9921 and CVE-2016-9922
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 21a859a71816..eb1672101263 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -143,6 +143,11 @@ stdenv.mkDerivation rec {
       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" ];