summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-04-06 14:16:42 +0000
committerRobin Gloster <mail@glob.in>2016-04-06 14:16:42 +0000
commit5ca99ae7a7d685980048dff05b5db18d31202ebe (patch)
tree60c4d02801e3989eee825141219808e5f14c71ef
parent8d4443a89a7b3dc9921bf759cce9c9912dc297fe (diff)
downloadnixlib-5ca99ae7a7d685980048dff05b5db18d31202ebe.tar
nixlib-5ca99ae7a7d685980048dff05b5db18d31202ebe.tar.gz
nixlib-5ca99ae7a7d685980048dff05b5db18d31202ebe.tar.bz2
nixlib-5ca99ae7a7d685980048dff05b5db18d31202ebe.tar.lz
nixlib-5ca99ae7a7d685980048dff05b5db18d31202ebe.tar.xz
nixlib-5ca99ae7a7d685980048dff05b5db18d31202ebe.tar.zst
nixlib-5ca99ae7a7d685980048dff05b5db18d31202ebe.zip
kernel.i686-linux: disable bindnow hardening
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 85a4b98982a4..348221ce05d8 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -225,7 +225,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
   nativeBuildInputs = [ perl bc nettools openssl ] ++ optional (stdenv.platform.uboot != null)
     (ubootChooser stdenv.platform.uboot);
 
-  hardeningDisable = [ "format" "fortify" "stackprotector" "pic" ];
+  hardeningDisable = [ "format" "fortify" "stackprotector" "pic" ]
+    ++ stdenv.lib.optional stdenv.isi686 "bindnow";
 
   makeFlags = commonMakeFlags ++ [
     "ARCH=${stdenv.platform.kernelArch}"