about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/qemu/default.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-01-29 00:14:20 +0000
committerGitHub <noreply@github.com>2024-01-29 00:14:20 +0000
commit5652edd85f688e4cd1bd9aa04e85786c5eeb3c53 (patch)
tree44038a23528759f1b987008006011596d5c08e63 /pkgs/applications/virtualization/qemu/default.nix
parent8b390e24378ebbaaa7db620df108d2fb6c2f5e22 (diff)
parent1e4f8b195d7c34dc9f0bcd919f63b3f03b42908a (diff)
Merge release-23.11 into staging-next-23.11
Diffstat (limited to 'pkgs/applications/virtualization/qemu/default.nix')
-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 6bda73ead26a7..259424d767733 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -132,6 +132,11 @@ stdenv.mkDerivation (finalAttrs: {
       sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E=";
       revert = true;
     })
+    (fetchpatch {
+      name = "CVE-2023-6693.patch";
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/2220e8189fb94068dbad333228659fbac819abb0.patch";
+      sha256 = "sha256-uoFFFsVZ8XnsI2GD7xsRFNWghWL7/PSYTc1yhXI6nv4=";
+    })
   ]
   ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;