summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-02-23 19:23:29 -0500
committerGraham Christensen <graham@grahamc.com>2017-02-23 19:23:29 -0500
commitd36b1ccc135fd86dd228db735ce6ef54d69cd9a1 (patch)
tree29949e352faa0625afc7302bc9d6aebfe59255b4 /pkgs/os-specific/linux
parent53a2baabbeb29ce0180b0353deb623139f1808bd (diff)
downloadnixpkgs-d36b1ccc135fd86dd228db735ce6ef54d69cd9a1.tar
nixpkgs-d36b1ccc135fd86dd228db735ce6ef54d69cd9a1.tar.gz
nixpkgs-d36b1ccc135fd86dd228db735ce6ef54d69cd9a1.tar.bz2
nixpkgs-d36b1ccc135fd86dd228db735ce6ef54d69cd9a1.tar.lz
nixpkgs-d36b1ccc135fd86dd228db735ce6ef54d69cd9a1.tar.xz
nixpkgs-d36b1ccc135fd86dd228db735ce6ef54d69cd9a1.tar.zst
nixpkgs-d36b1ccc135fd86dd228db735ce6ef54d69cd9a1.zip
Revert "Revert "linux kernels: patch against DCCP double free (CVE-2017-6074)""
This reverts commit 53a2baabbeb29ce0180b0353deb623139f1808bd.
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index bb6bff1a1f0..c5a6b999f85 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -174,4 +174,13 @@ rec {
         sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
       };
     };
+
+  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";
+      };
+    };
 }