about summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2020-03-14 09:20:58 -0400
committerGitHub <noreply@github.com>2020-03-14 09:20:58 -0400
commit244178e16676dfa3ddfa5e7596b4ddba20410bc4 (patch)
treef18352589e799bec030472a8c1e3e66cf166ef2f /pkgs/os-specific/linux
parent17a0f62bed6ebf44c101f0de1bffeceae4bea40c (diff)
parentb628400f5e70c361cc74e6a5c1d041f6a2189e5f (diff)
downloadnixlib-244178e16676dfa3ddfa5e7596b4ddba20410bc4.tar
nixlib-244178e16676dfa3ddfa5e7596b4ddba20410bc4.tar.gz
nixlib-244178e16676dfa3ddfa5e7596b4ddba20410bc4.tar.bz2
nixlib-244178e16676dfa3ddfa5e7596b4ddba20410bc4.tar.lz
nixlib-244178e16676dfa3ddfa5e7596b4ddba20410bc4.tar.xz
nixlib-244178e16676dfa3ddfa5e7596b4ddba20410bc4.tar.zst
nixlib-244178e16676dfa3ddfa5e7596b4ddba20410bc4.zip
Merge pull request #82006 from emilazy/enable-linux-hardened-ia32-emulation
linuxPackages_{,_latest,_testing}_hardened: enable 32-bit emulation
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/hardened-config.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index b28ce770f7a9..3010d87a178a 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -19,8 +19,7 @@ assert (versionAtLeast version "4.9");
 optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") {
   DEFAULT_MMAP_MIN_ADDR = freeform "65536";  # Prevent allocation of first 64K of memory
 
-  # Reduce attack surface by disabling various emulations
-  IA32_EMULATION     = no;
+  # Reduce attack surface by disabling X32
   X86_X32            = no;
   # Note: this config depends on EXPERT y and so will not take effect, hence
   # it is left "optional" for now.