diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-12-02 21:14:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 21:14:16 +0100 |
| commit | ccb3f1c9dde4aa91ad96bb160726c9e1294e47e7 (patch) | |
| tree | acbc27a4b26e398cda91a3df79c3bced6b8ba113 /pkgs/applications/virtualization | |
| parent | 71baee273c9dbedab47627f8ead825ce756867cf (diff) | |
| parent | c3f268000e02651f6c9fdeacfd115cc479c35b17 (diff) | |
Merge pull request #105591 from mweinelt/qemu
qemu: fix CVE-2020-28916
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 163a87d7072f..5d4b891ad5de 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -83,6 +83,12 @@ stdenv.mkDerivation rec { ./fix-qemu-ga.patch ./9p-ignore-noatime.patch ./CVE-2020-27617.patch + (fetchpatch { + # e1000e: infinite loop scenario in case of null packet descriptor, remove for QEMU >= 5.2.0-rc3 + name = "CVE-2020-28916.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=c2cb511634012344e3d0fe49a037a33b12d8a98a"; + sha256 = "1kvm6wl4vry0npiisxsn76h8nf1iv5fmqsyjvb46203f1yyg5pis"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { |