diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2023-05-12 04:16:21 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2023-05-15 05:48:56 +0200 |
| commit | 17d26e4c7fc1ab8697d63523daf2d2742f432d2a (patch) | |
| tree | efe66e0eb484ed51389755ec6cdaa2dcfb90ce57 | |
| parent | 3fc5d42ecdd5e5316f434e6ecc8029112fffe40a (diff) | |
linux: patch to fix MAP_32BIT crashes, e.g. Haskell
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f2225096dd5ca..3a76ed2d08823 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,6 +58,15 @@ patch = ./export-rt-sched-migrate.patch; }; + make-maple-state-reusable-after-mas_empty_area = rec { + name = "make-maple-state-reusable-after-mas_empty_area"; + patch = fetchpatch { + name = name + ".patch"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/patch/?id=39bf07d812b888b23983a9443ad967ca9b61551d"; + hash = "sha256-JHEFq+Gw8Dtl0M8pXcKXpwkaHhbbl5NwTSzvV5qP4hk="; + }; + }; + fix-em-ice-bonding = { name = "fix-em-ice-bonding"; patch = ./fix-em-ice-bonding.patch; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ddf588b5a277d..5061ef303d6f0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -174,6 +174,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.make-maple-state-reusable-after-mas_empty_area kernelPatches.fix-em-ice-bonding kernelPatches.CVE-2023-32233 ]; @@ -183,6 +184,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.make-maple-state-reusable-after-mas_empty_area kernelPatches.fix-em-ice-bonding kernelPatches.export-rt-sched-migrate kernelPatches.CVE-2023-32233 @@ -193,6 +195,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.make-maple-state-reusable-after-mas_empty_area kernelPatches.fix-em-ice-bonding kernelPatches.CVE-2023-32233 ]; @@ -202,6 +205,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.make-maple-state-reusable-after-mas_empty_area kernelPatches.fix-em-ice-bonding kernelPatches.CVE-2023-32233 ]; @@ -212,6 +216,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.make-maple-state-reusable-after-mas_empty_area ]; }; latest = packageAliases.linux_latest.kernel; |