summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2019-12-19 00:51:04 +0000
committerRobert Scott <code@humanleg.org.uk>2019-12-19 00:51:04 +0000
commitf5c0d150e7d3d4b6d6b37ebb70618eb9d8137996 (patch)
treedd8a1d62040ac66f2d6cc2a325b75bcf4043b47b /pkgs/applications/virtualization
parent8c3a97fa7e18046c2847ac75b95a88bc18683f8f (diff)
downloadnixpkgs-f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996.tar
nixpkgs-f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996.tar.gz
nixpkgs-f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996.tar.bz2
nixpkgs-f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996.tar.lz
nixpkgs-f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996.tar.xz
nixpkgs-f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996.tar.zst
nixpkgs-f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996.zip
qemu: add patch for CVE-2019-15890
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index b6dea611868..67aa36b7827 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
     ./no-etc-install.patch
     ./fix-qemu-ga.patch
     ./9p-ignore-noatime.patch
+    (fetchpatch {
+      name = "CVE-2019-15890.patch";
+      url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=c59279437eda91841b9d26079c70b8a540d41204";
+      sha256 = "1q2rc67mfdz034mk81z9bw105x9zad7n954sy3kq068b1svrf7iy";
+      stripLen = 1;
+      extraPrefix = "slirp/";
+    })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
     ++ optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {