diff options
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-mptcp.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index dc4d10a0412..4c237cb24b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,18 +1,18 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91.3"; - modDirVersion = "4.1.38"; + mptcpVersion = "0.92.1"; + modDirVersion = "4.4.83"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { - branch = "4.1"; - maintainers = [ stdenv.lib.maintainers.layus ]; + branch = "4.4"; + maintainers = with stdenv.lib.maintainers; [ teto layus ]; }; src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; + sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz"; }; extraConfig = '' diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 93d7acdd8e7..c1288108b4f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,15 +58,6 @@ rec { cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - DCCP_double_free_vulnerability_CVE-2017-6074 = rec - { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch"; - patch = fetchpatch { - inherit name; - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4"; - sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; - }; - }; - tag_hardened = rec { name = "tag-hardened"; patch = ./tag-hardened.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7f9ebf611e..420c84b9b2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12394,11 +12394,12 @@ with pkgs; }; }; + # linux mptcp is based on the 4.4 kernel linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes - kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 + kernelPatches.cpu-cgroup-v2."4.4" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu |