diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-29 15:04:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-29 15:04:02 +0100 |
| commit | df5600d440d1fdcc0a313f8d6f2b757212c13283 (patch) | |
| tree | 60de0a77d34b4d99d7279805f491412d1fd02db3 | |
| parent | 4654fb6aa5a0a0fafc0fece952f878af5fe4e99b (diff) | |
| parent | 268d3656dbe04fe2eb0423440032dd74937ad427 (diff) | |
| download | nixpkgs-df5600d440d1fdcc0a313f8d6f2b757212c13283.tar nixpkgs-df5600d440d1fdcc0a313f8d6f2b757212c13283.tar.gz nixpkgs-df5600d440d1fdcc0a313f8d6f2b757212c13283.tar.bz2 nixpkgs-df5600d440d1fdcc0a313f8d6f2b757212c13283.tar.lz nixpkgs-df5600d440d1fdcc0a313f8d6f2b757212c13283.tar.xz nixpkgs-df5600d440d1fdcc0a313f8d6f2b757212c13283.tar.zst nixpkgs-df5600d440d1fdcc0a313f8d6f2b757212c13283.zip | |
Merge #32163: qemu: patch CVE-2017-15118
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 66e5928ca15..2488bb1ae10 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -62,7 +62,12 @@ stdenv.mkDerivation rec { patches = [ ./no-etc-install.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optional pulseSupport ./fix-hda-recording.patch; + ++ optional pulseSupport ./fix-hda-recording.patch + ++ [ (fetchpatch { + name = "qemu-CVE-2017-15118.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=51ae4f8455c9e32c54770c4ebc25bf86a8128183"; + sha256 = "0f9i096dz3h1i8g92y99vak23rjs1shf7prlcxqizsz0fah7wx7h"; }) + ]; hardeningDisable = [ "stackprotector" ]; |