summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2017-03-15 07:23:52 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2017-03-15 07:25:21 +0100
commit9e60a17cb82b4387832fd563892c8ee1639a99c8 (patch)
tree0f541f0d61c183420d3784bd12f72892f41e3fd4 /pkgs/os-specific
parentf5ccf24028982048f7ca55581435944494653a4a (diff)
downloadnixpkgs-9e60a17cb82b4387832fd563892c8ee1639a99c8.tar
nixpkgs-9e60a17cb82b4387832fd563892c8ee1639a99c8.tar.gz
nixpkgs-9e60a17cb82b4387832fd563892c8ee1639a99c8.tar.bz2
nixpkgs-9e60a17cb82b4387832fd563892c8ee1639a99c8.tar.lz
nixpkgs-9e60a17cb82b4387832fd563892c8ee1639a99c8.tar.xz
nixpkgs-9e60a17cb82b4387832fd563892c8ee1639a99c8.tar.zst
nixpkgs-9e60a17cb82b4387832fd563892c8ee1639a99c8.zip
grsecurity: 4.9.14-201703121245 -> 4.9.15-201703150049
Contains a fix for the n_hdlc double free bug.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-grsecurity.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index b10ef6a6a67..540ec0e5699 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.14";
+  version = "4.9.15";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "0qc78s1j3mm03qs5m3dkc1ah9zchwdkmnkl1bl516dr9gy9i386all5c3f9bxniy8dd3lsk7bgfyqnigav1gyaki7vf9jh9ywqz58vd";
+    sha512 = "3p0cfjfmq4r04w6bjyi2aphq171yavv9m06b29wjsglb1bbkyiy4v278r99cq913msmdp3xs0ba1rkc36qp7cv7hxc29pj0w06ajwls";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 25441c5a5d2..c3da24bdfac 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.14";
-      grrev  = "201703121245";
-      sha512 = "1h9d1vvfwxn8flzhbii7xd808cmhw8az895sk3fam2vjy5ls1mxvrmvw0z9nzx5sq2hgjg9adyz52y5nj2rza09n3m2gn4i7lid81hh";
+    { kver   = "4.9.15";
+      grrev  = "201703150049";
+      sha512 = "1x02ncl94835n85kpp5bfvy6863sb482fw30x2pqszi4aivjc31i77vj135a7f508ni1b9rbbl8a0m3q4nb8gdbia75zcxbjdi9ij9m";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,