Unverified Commit c0a88fac authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

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

linux: patch to fix MAP_32BIT crashes, e.g. Haskell
parents 1784646f 17d26e4c

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