diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2023-05-15 20:24:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-15 20:24:21 +0200 |
commit | c0a88fac2190458346142d0ccac424c46669129e (patch) | |
tree | 6053df9f0c10d2ae07025d113f7dc5238170e820 /pkgs | |
parent | 1784646fc10266683fa63a32beaa2a37804f6df5 (diff) | |
parent | 17d26e4c7fc1ab8697d63523daf2d2742f432d2a (diff) | |
download | nixpkgs-c0a88fac2190458346142d0ccac424c46669129e.tar nixpkgs-c0a88fac2190458346142d0ccac424c46669129e.tar.gz nixpkgs-c0a88fac2190458346142d0ccac424c46669129e.tar.bz2 nixpkgs-c0a88fac2190458346142d0ccac424c46669129e.tar.lz nixpkgs-c0a88fac2190458346142d0ccac424c46669129e.tar.xz nixpkgs-c0a88fac2190458346142d0ccac424c46669129e.tar.zst nixpkgs-c0a88fac2190458346142d0ccac424c46669129e.zip |
Merge pull request #231393 from hercules-ci/fix-haskell-crashes
linux: patch to fix MAP_32BIT crashes, e.g. Haskell
Diffstat (limited to 'pkgs')
-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 f2225096dd5..3a76ed2d088 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 ee2f6481f8c..c44b5b3e738 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -178,6 +178,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 ]; }; @@ -186,6 +187,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 @@ -196,6 +198,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 ]; }; @@ -204,6 +207,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 ]; }; @@ -213,6 +217,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; |