From 481765892f01ff46881157391694cd91d65a98b3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 27 Aug 2022 14:30:33 +0100 Subject: [PATCH 1/2] qemu: add patches for CVE-2022-0216 --- .../applications/virtualization/qemu/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bb20f2a73840f..e83005517c4f2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -126,6 +126,22 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/418ade7849ce7641c0f7333718caf5091a02fd4c.patch"; sha256 = "sha256-zQHDXedIXZBnabv4+3TA4z5mY1+KZiPmqUbhaSkGLgA="; }) + # needed for CVE-2022-0216's test to pass + (fetchpatch { + name = "fuzz-tests-x86-only.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/b911c30c566dee48a27bc1bfa1ee6df3a729cbbb.patch"; + sha256 = "sha256-RXKRmZo25yZ1VuBtBA+BsY8as9kIcACqE6aEYmIm9KQ="; + }) + (fetchpatch { + name = "CVE-2022-0216.part-1.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8.patch"; + sha256 = "sha256-0z0zVPBVXFSU8qEV0Ea2+rDxyikMyitlDM0jZOLLC6s="; + }) + (fetchpatch { + name = "CVE-2022-0216.part-2.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/4367a20cc442c56b05611b4224de9a61908f9eac.patch"; + sha256 = "sha256-hpNu4Zjw1dIbT6Vt57cayHE1Elaltp0a/bsKlDY0Qr8="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; From 42a7627f09313cdddd61c01f0fe33a804ddb111c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 27 Aug 2022 22:55:36 +0100 Subject: [PATCH 2/2] qemu: add patch for CVE-2020-14394 --- pkgs/applications/virtualization/qemu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e83005517c4f2..32dc872a5c4b1 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -142,6 +142,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/4367a20cc442c56b05611b4224de9a61908f9eac.patch"; sha256 = "sha256-hpNu4Zjw1dIbT6Vt57cayHE1Elaltp0a/bsKlDY0Qr8="; }) + (fetchpatch { + name = "CVE-2020-14394.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/effaf5a240e03020f4ae953e10b764622c3e87cc.patch"; + sha256 = "sha256-NobsIxRC+xlyj8d/oD4mqgXAGX37pfww/PQQuKhrTzc="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;