diff options
| author | Robert Scott <code@humanleg.org.uk> | 2021-07-18 14:35:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-20 16:39:04 +0000 |
| commit | f3414d7d2b4d4014fbca6f28c51cf2445602051d (patch) | |
| tree | b99e0d1e94d6bff346e5d2c10c9124e376ccc2ae | |
| parent | Merge pull request #130775 from NixOS/backport-128095-to-release-21.05 (diff) | |
| download | nixpkgs-f3414d7d2b4d4014fbca6f28c51cf2445602051d.tar.gz | |
qemu: add patches for CVE-2021-3545 & CVE-2021-3546
(cherry picked from commit cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0)
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0a9de4eb10a7..f5783c436f98 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 { |