From 3b32cd2a5b951a82e37c2d8f9069ac3f12d62868 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 5 Apr 2020 05:55:58 +0100
Subject: [PATCH] nixos/hardened: don't set slab_nomerge

Upstreamed in anthraxx/linux-hardened@df29f9248c6b2459dcaae216dc6f4751fab4ff3b.
---
 nixos/modules/profiles/hardened.nix | 3 ---
 1 file changed, 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"