From 0c66dbaee6647abfb4d2774588a0cf0ad8d4f02b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 2 Apr 2014 17:58:54 -0400 Subject: [PATCH] Enable CC_STACKPROTECTOR_REGULAR on linux 3.14+ --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a2b139dc6fc..5aed09105cc 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -167,8 +167,10 @@ with stdenv.lib; STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default DEVKMEM n # Disable /dev/kmem - ${optionalString (versionOlder version "3.14") '' + ${if versionOlder version "3.14" then '' CC_STACKPROTECTOR y # Detect buffer overflows on the stack + '' else '' + CC_STACKPROTECTOR_REGULAR y ''} ${optionalString (versionAtLeast version "3.12") '' USER_NS y # Support for user namespaces