summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2021-07-18 14:35:50 +0100
committerRobert Scott <code@humanleg.org.uk>2021-07-18 14:49:50 +0100
commitcddea297f28ab67d1f2bf0902bfdcc95ec29a8a0 (patch)
tree92ef395f31ca9ea92d6e182df980bf7782c7a6db /pkgs/applications
parent688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff)
downloadnixpkgs-cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0.tar
nixpkgs-cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0.tar.gz
nixpkgs-cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0.tar.bz2
nixpkgs-cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0.tar.lz
nixpkgs-cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0.tar.xz
nixpkgs-cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0.tar.zst
nixpkgs-cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0.zip
qemu: add patches for CVE-2021-3545 & CVE-2021-3546
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 7fd01a8ffa9..3c9e7ae8c52 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -86,6 +86,16 @@ stdenv.mkDerivation rec {
   patches = [
     ./fix-qemu-ga.patch
     ./9p-ignore-noatime.patch
+    (fetchpatch {
+      name = "CVE-2021-3545.patch";
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/121841b25d72d13f8cad554363138c360f1250ea.patch";
+      sha256 = "13dgfd8dmxcalh2nvb68iv0kyv4xxrvpdqdxf1h3bjr4451glag1";
+    })
+    (fetchpatch {
+      name = "CVE-2021-3546.patch";
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/9f22893adcb02580aee5968f32baa2cd109b3ec2.patch";
+      sha256 = "1vkhm9vl671y4cra60b6704339qk1h5dyyb3dfvmvpsvfyh2pm7n";
+    })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
     ++ optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {