nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232410 from yu-re-ka/backport-map-32bit-fix

Browse Source 
[Backport 22.11] linux: patch to fix MAP_32BIT crashes, e.g. Haskell
This commit is contained in:
Robert Hensing
2023-05-17 14:26:53 +02:00
committed by GitHub
parent 6c591e7adc bbea464886
commit 000c62cba5
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/os-specific/linux/kernel/make-maple-state-reusable-after-mas_empty_area.patch Normal file
View File

@@ -0,0 +1,21 @@
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5317,15 +5317,9 @@
mt = mte_node_type(mas->node);
pivots = ma_pivots(mas_mn(mas), mt);
- if (offset)
- mas->min = pivots[offset - 1] + 1;
-
- if (offset < mt_pivots[mt])
- mas->max = pivots[offset];
-
- if (mas->index < mas->min)
- mas->index = mas->min;
-
+ min = mas_safe_min(mas, pivots, offset);
+ if (mas->index < min)
+ mas->index = min;
mas->last = mas->index + size - 1;
return 0;
}

6
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -58,6 +58,12 @@
patch = ./export-rt-sched-migrate.patch;
};
# https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/patch/?id=39bf07d812b888b23983a9443ad967ca9b61551d
make-maple-state-reusable-after-mas_empty_area = {
name = "make-maple-state-reusable-after-mas_empty_area";
patch = ./make-maple-state-reusable-after-mas_empty_area.patch;
};
fix-em-ice-bonding = {
name = "fix-em-ice-bonding";
patch = ./fix-em-ice-bonding.patch;

4
pkgs/top-level/linux-kernels.nix
View File

@@ -168,6 +168,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
];
@@ -177,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
kernelPatches.CVE-2023-32233
];
@@ -186,6 +188,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
];
@@ -196,6 +199,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;