X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2F__init__.py;h=9f4bbb2771d4614f216ff2a045a13c082af6a0d2;hb=6c2257f40b60ae5d04c6ab98aea9cfbe43c2ea00;hp=620c8e9d42b5a9f15e4e3774e78ed24844295000;hpb=0b522bd188f3f1644fab939a2a297d9afc7e1387;p=kconfig-hardened-check.git

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index 620c8e9..9f4bbb2 100644
--- a/kconfig_hardened_check/__init__.py
+++ b/kconfig_hardened_check/__init__.py
@@ -16,7 +16,7 @@
 #    iommu.passthrough=0
 #    iommu.strict=1
 #    slub_debug=FZ (slow)
-#    init_on_free=1 (since v5.3, otherwise slub_debug=P and page_poison=1)
+#    slub_debug=P
 #    loadpin.enforce=1
 #    debugfs=no-mount (or off if possible)
 #
@@ -416,7 +416,8 @@ def add_kconfig_checks(l, arch):
     l += [OR(KconfigCheck('self_protection', 'kspp', 'INIT_STACK_ALL_ZERO', 'y'),
              KconfigCheck('self_protection', 'kspp', 'GCC_PLUGIN_STRUCTLEAK_BYREF_ALL', 'y'))]
     l += [OR(KconfigCheck('self_protection', 'kspp', 'INIT_ON_FREE_DEFAULT_ON', 'y'),
-             KconfigCheck('self_protection', 'kspp', 'PAGE_POISONING_ZERO', 'y'))]
+             AND(KconfigCheck('self_protection', 'kspp', 'PAGE_POISONING_ZERO', 'y'),
+                 CmdlineCheck('self_protection', 'kspp', 'page_poison', '1')))]
              # CONFIG_INIT_ON_FREE_DEFAULT_ON was added in v5.3.
              # CONFIG_PAGE_POISONING_ZERO was removed in v5.11.
              # Starting from v5.11 CONFIG_PAGE_POISONING unconditionally checks
@@ -649,6 +650,9 @@ def add_cmdline_checks(l, arch):
     l += [OR(CmdlineCheck('self_protection', 'kspp', 'init_on_alloc', '1'),
              AND(KconfigCheck('self_protection', 'kspp', 'INIT_ON_ALLOC_DEFAULT_ON', 'y'),
                  CmdlineCheck('self_protection', 'kspp', 'init_on_alloc', 'is not set')))]
+    l += [OR(CmdlineCheck('self_protection', 'kspp', 'init_on_free', '1'),
+             AND(KconfigCheck('self_protection', 'kspp', 'INIT_ON_FREE_DEFAULT_ON', 'y'),
+                 CmdlineCheck('self_protection', 'kspp', 'init_on_free', 'is not set')))]
     l += [OR(CmdlineCheck('self_protection', 'kspp', 'slab_nomerge'),
              AND(KconfigCheck('self_protection', 'clipos', 'SLAB_MERGE_DEFAULT', 'is not set'),
                  CmdlineCheck('self_protection', 'kspp', 'slab_merge', 'is not set')))] # option presence check