diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 02:23:59 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 02:23:59 +0200 |
commit | 639b74e7bec3e743bd76b15d6ca8308e0c548cd6 (patch) | |
tree | 7ff2ce54305b477d66803b57c7e88c2079e7110b /pkgs | |
parent | 40a04291c9a4e39bf6e68a557982cbb3f814a10c (diff) | |
download | nixlib-639b74e7bec3e743bd76b15d6ca8308e0c548cd6.tar nixlib-639b74e7bec3e743bd76b15d6ca8308e0c548cd6.tar.gz nixlib-639b74e7bec3e743bd76b15d6ca8308e0c548cd6.tar.bz2 nixlib-639b74e7bec3e743bd76b15d6ca8308e0c548cd6.tar.lz nixlib-639b74e7bec3e743bd76b15d6ca8308e0c548cd6.tar.xz nixlib-639b74e7bec3e743bd76b15d6ca8308e0c548cd6.tar.zst nixlib-639b74e7bec3e743bd76b15d6ca8308e0c548cd6.zip |
Revert "linux: patch CVE-2017-1000364 (stack clash)"
This reverts commit aab71b31d5030bea94804d3677a3ffbc60e1876a. This was integrated into the stable 4.9 and 4.11 kernels.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 19 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3e658e55dace..1747d34fe112 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -156,23 +156,4 @@ rec { sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; }; }; - - # CVE-2017-1000364 (stack clash) - mm_larger_stack_guard_gap_4_9 = rec - { name = "mm-larger-stack-guard-gap-between-vmas.patch"; - patch = fetchpatch { - inherit name; - url = "https://anonscm.debian.org/cgit/kernel/linux.git/plain/debian/patches/bugfix/all/mm-enlarge-stack-guard-gap.patch?h=debian/4.9.30-2%2bdeb9u1_bpo8%2b1"; - sha256 = "0bl7w1zgcy691avp54p6mvzdam6snrb7pz3hywsf2g2mcxjkyja5"; - }; - }; - - mm_larger_stack_guard_gap_4_11 = rec - { name = "mm-larger-stack-guard-gap-between-vmas.patch"; - patch = fetchpatch { - inherit name; - url = "https://anonscm.debian.org/cgit/kernel/linux.git/plain/debian/patches/bugfix/all/mm-larger-stack-guard-gap-between-vmas.patch?h=debian/4.11.6-1"; - sha256 = "19bakn3119v5jkhh4w7x3d50py9an1w8h7v3mmy7y2l2agj4mn3i"; - }; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab5950d5614d..2f64f901dfb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11921,7 +11921,6 @@ with pkgs; kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long - kernelPatches.mm_larger_stack_guard_gap_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11938,7 +11937,6 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.mm_larger_stack_guard_gap_4_11 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu |