summary refs log tree commit diff
path: root/nixos/modules/profiles
diff options
context:
space:
mode:
authorEmily <vcs@emily.moe>2020-04-05 05:55:58 +0100
committerEmily <vcs@emily.moe>2020-04-17 16:13:39 +0100
commit3b32cd2a5b951a82e37c2d8f9069ac3f12d62868 (patch)
treee6ff9d62ac76702259eabe95486dfbd3a21da902 /nixos/modules/profiles
parent7fdfe5381d338c6f8fae6752b69055401e170627 (diff)
downloadnixpkgs-3b32cd2a5b951a82e37c2d8f9069ac3f12d62868.tar
nixpkgs-3b32cd2a5b951a82e37c2d8f9069ac3f12d62868.tar.gz
nixpkgs-3b32cd2a5b951a82e37c2d8f9069ac3f12d62868.tar.bz2
nixpkgs-3b32cd2a5b951a82e37c2d8f9069ac3f12d62868.tar.lz
nixpkgs-3b32cd2a5b951a82e37c2d8f9069ac3f12d62868.tar.xz
nixpkgs-3b32cd2a5b951a82e37c2d8f9069ac3f12d62868.tar.zst
nixpkgs-3b32cd2a5b951a82e37c2d8f9069ac3f12d62868.zip
nixos/hardened: don't set slab_nomerge
Upstreamed in anthraxx/linux-hardened@df29f9248c6b2459dcaae216dc6f4751fab4ff3b.
Diffstat (limited to 'nixos/modules/profiles')
-rw-r--r--nixos/modules/profiles/hardened.nix3
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 35743d83134..49cd3504aa0 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -37,9 +37,6 @@ with lib;
     # Slab/slub sanity checks, redzoning, and poisoning
     "slub_debug=FZP"
 
-    # Disable slab merging to make certain heap overflow attacks harder
-    "slab_nomerge"
-
     # Overwrite free'd memory
     "page_poison=1"