about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-06-10 22:20:18 +0200
committerVladimír Čunát <v@cunat.cz>2020-06-10 22:20:18 +0200
commit16658adcc4bfa8b70de75ef63937c6be10296840 (patch)
tree526d8f89fd360d32eedbf11bdf7f0339dc13094d
parentf71490bd1d0ad95cda667e55f121cee2953cf8be (diff)
parent841705284c85e82258dcc852a9ca1b4e057ddd7e (diff)
downloadnixlib-16658adcc4bfa8b70de75ef63937c6be10296840.tar
nixlib-16658adcc4bfa8b70de75ef63937c6be10296840.tar.gz
nixlib-16658adcc4bfa8b70de75ef63937c6be10296840.tar.bz2
nixlib-16658adcc4bfa8b70de75ef63937c6be10296840.tar.lz
nixlib-16658adcc4bfa8b70de75ef63937c6be10296840.tar.xz
nixlib-16658adcc4bfa8b70de75ef63937c6be10296840.tar.zst
nixlib-16658adcc4bfa8b70de75ef63937c6be10296840.zip
Merge #90057: linux_*hardened: fix kernel config options
-rw-r--r--pkgs/os-specific/linux/kernel/hardened/config.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix
index 95510fe218e3..c817f1044271 100644
--- a/pkgs/os-specific/linux/kernel/hardened/config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened/config.nix
@@ -40,11 +40,12 @@ assert (versionAtLeast version "4.9");
   # Perform additional validation of commonly targeted structures.
   DEBUG_CREDENTIALS     = yes;
   DEBUG_NOTIFIERS       = yes;
-  DEBUG_PI_LIST         = yes; # doesn't BUG()
+  DEBUG_PI_LIST         = whenOlder "5.2" yes; # doesn't BUG()
+  DEBUG_PLIST           = whenAtLeast "5.2" yes;
   DEBUG_SG              = yes;
   SCHED_STACK_END_CHECK = yes;
 
-  REFCOUNT_FULL = whenAtLeast "4.13" yes;
+  REFCOUNT_FULL = whenBetween "4.13" "5.5" yes;
 
   # Randomize page allocator when page_alloc.shuffle=1
   SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes;