Commit 17d26e4c authored by Robert Hensing's avatar Robert Hensing
Browse files

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

parent 3fc5d42e

pkgs/os-specific/linux/kernel/patches.nix

+9 −0
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/linux-kernels.nix

+5 −0
Original line number Diff line number Diff line
@@ -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;