lol

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

linux: patch to fix MAP_32BIT crashes, e.g. Haskell

authored by

Robert Hensing and committed by
GitHub
c0a88fac 1784646f

+14
+9
pkgs/os-specific/linux/kernel/patches.nix
··· 58 patch = ./export-rt-sched-migrate.patch; 59 }; 60 61 fix-em-ice-bonding = { 62 name = "fix-em-ice-bonding"; 63 patch = ./fix-em-ice-bonding.patch;
··· 58 patch = ./export-rt-sched-migrate.patch; 59 }; 60 61 + make-maple-state-reusable-after-mas_empty_area = rec { 62 + name = "make-maple-state-reusable-after-mas_empty_area"; 63 + patch = fetchpatch { 64 + name = name + ".patch"; 65 + url = "https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/patch/?id=39bf07d812b888b23983a9443ad967ca9b61551d"; 66 + hash = "sha256-JHEFq+Gw8Dtl0M8pXcKXpwkaHhbbl5NwTSzvV5qP4hk="; 67 + }; 68 + }; 69 + 70 fix-em-ice-bonding = { 71 name = "fix-em-ice-bonding"; 72 patch = ./fix-em-ice-bonding.patch;
+5
pkgs/top-level/linux-kernels.nix
··· 178 kernelPatches = [ 179 kernelPatches.bridge_stp_helper 180 kernelPatches.request_key_helper 181 kernelPatches.fix-em-ice-bonding 182 ]; 183 }; ··· 186 kernelPatches = [ 187 kernelPatches.bridge_stp_helper 188 kernelPatches.request_key_helper 189 kernelPatches.fix-em-ice-bonding 190 kernelPatches.export-rt-sched-migrate 191 kernelPatches.CVE-2023-32233 ··· 196 kernelPatches = [ 197 kernelPatches.bridge_stp_helper 198 kernelPatches.request_key_helper 199 kernelPatches.fix-em-ice-bonding 200 ]; 201 }; ··· 204 kernelPatches = [ 205 kernelPatches.bridge_stp_helper 206 kernelPatches.request_key_helper 207 kernelPatches.fix-em-ice-bonding 208 ]; 209 }; ··· 213 kernelPatches = [ 214 kernelPatches.bridge_stp_helper 215 kernelPatches.request_key_helper 216 ]; 217 }; 218 latest = packageAliases.linux_latest.kernel;
··· 178 kernelPatches = [ 179 kernelPatches.bridge_stp_helper 180 kernelPatches.request_key_helper 181 + kernelPatches.make-maple-state-reusable-after-mas_empty_area 182 kernelPatches.fix-em-ice-bonding 183 ]; 184 }; ··· 187 kernelPatches = [ 188 kernelPatches.bridge_stp_helper 189 kernelPatches.request_key_helper 190 + kernelPatches.make-maple-state-reusable-after-mas_empty_area 191 kernelPatches.fix-em-ice-bonding 192 kernelPatches.export-rt-sched-migrate 193 kernelPatches.CVE-2023-32233 ··· 198 kernelPatches = [ 199 kernelPatches.bridge_stp_helper 200 kernelPatches.request_key_helper 201 + kernelPatches.make-maple-state-reusable-after-mas_empty_area 202 kernelPatches.fix-em-ice-bonding 203 ]; 204 }; ··· 207 kernelPatches = [ 208 kernelPatches.bridge_stp_helper 209 kernelPatches.request_key_helper 210 + kernelPatches.make-maple-state-reusable-after-mas_empty_area 211 kernelPatches.fix-em-ice-bonding 212 ]; 213 }; ··· 217 kernelPatches = [ 218 kernelPatches.bridge_stp_helper 219 kernelPatches.request_key_helper 220 + kernelPatches.make-maple-state-reusable-after-mas_empty_area 221 ]; 222 }; 223 latest = packageAliases.linux_latest.kernel;