summary refs log tree commit diff
diff options
context:
space:
mode:
authorAntoine Eiche <lewo@abesis.fr>2016-12-28 23:36:49 +0100
committerGraham Christensen <graham@grahamc.com>2016-12-28 20:36:53 -0500
commita5dd31120873ece433de07683fc48646568f877e (patch)
tree341f623018f7b936b227cc61347938a049002d1f
parent5ca180fa084e45665ecb0ec8d74461a0a8e43f29 (diff)
downloadnixlib-a5dd31120873ece433de07683fc48646568f877e.tar
nixlib-a5dd31120873ece433de07683fc48646568f877e.tar.gz
nixlib-a5dd31120873ece433de07683fc48646568f877e.tar.bz2
nixlib-a5dd31120873ece433de07683fc48646568f877e.tar.lz
nixlib-a5dd31120873ece433de07683fc48646568f877e.tar.xz
nixlib-a5dd31120873ece433de07683fc48646568f877e.tar.zst
nixlib-a5dd31120873ece433de07683fc48646568f877e.zip
qemu: fix CVE-2016-9911
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a99b37f0d17d..21a859a71816 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -137,6 +137,12 @@ 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";
+    })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
   hardeningDisable = [ "stackprotector" ];