summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-08-16 21:09:22 +0200
committerGitHub <noreply@github.com>2021-08-16 21:09:22 +0200
commit6546f6a63a31d5a370d5b3005d074ecfb2fee013 (patch)
tree8f127484f2b75c4ef8b5da59b10e4a7a80990957 /pkgs/os-specific/linux/kernel
parenta2688f741aeb3fc6e822c1dad8a1c38cd3b6153c (diff)
parent099113751e66899a620bb3e23875d421fc40804f (diff)
downloadnixpkgs-6546f6a63a31d5a370d5b3005d074ecfb2fee013.tar
nixpkgs-6546f6a63a31d5a370d5b3005d074ecfb2fee013.tar.gz
nixpkgs-6546f6a63a31d5a370d5b3005d074ecfb2fee013.tar.bz2
nixpkgs-6546f6a63a31d5a370d5b3005d074ecfb2fee013.tar.lz
nixpkgs-6546f6a63a31d5a370d5b3005d074ecfb2fee013.tar.xz
nixpkgs-6546f6a63a31d5a370d5b3005d074ecfb2fee013.tar.zst
nixpkgs-6546f6a63a31d5a370d5b3005d074ecfb2fee013.zip
Merge pull request #134307 from Ma27/versioned-hardened-kernel
linuxPackages: drop latest_hardened, introduce versioned attributes
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r--pkgs/os-specific/linux/kernel/hardened/config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix
index 20f9f5aaa14..973e6d50adf 100644
--- a/pkgs/os-specific/linux/kernel/hardened/config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened/config.nix
@@ -88,7 +88,7 @@ assert (versionAtLeast version "4.9");
   INET_MPTCP_DIAG   = option no;
 
   # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage.
-  CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no;
+  CC_STACKPROTECTOR_REGULAR = lib.mkForce (whenOlder "4.18" no);
   CC_STACKPROTECTOR_STRONG  = whenOlder "4.18" yes;
 
   # Detect out-of-bound reads/writes and use-after-free