b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #231393 from hercules-ci/fix-haskell-crashes

Browse source 
linux: patch to fix MAP_32BIT crashes, e.g. Haskell
This commit is contained in:
Robert Hensing 2023-05-15 20:24:21 +02:00 committed by GitHub
parent 1784646fc1 17d26e4c7f
commit c0a88fac21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -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;

5
pkgs/top-level/linux-kernels.nix
View file

@ -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;