Support both versions of the STACKPROTECTOR_STRONG option

diff --git a/README.md b/README.md
index ac72965e792f69d99286b3faf8eba033740ab6aa..fe20cfe3391721ba8bab8495a9631c6eca9ea0cd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -47,8 +47,7 @@ optional arguments:
   CONFIG_DEBUG_WX                        |      y      | ubuntu18 |  self_protection   ||             OK             
   CONFIG_RANDOMIZE_BASE                  |      y      | ubuntu18 |  self_protection   ||             OK             
   CONFIG_RANDOMIZE_MEMORY                |      y      | ubuntu18 |  self_protection   ||             OK             
-  CONFIG_CC_STACKPROTECTOR               |      y      | ubuntu18 |  self_protection   ||             OK             
-  CONFIG_CC_STACKPROTECTOR_STRONG        |      y      | ubuntu18 |  self_protection   ||             OK             
+  CONFIG_STACKPROTECTOR_STRONG           |      y      | ubuntu18 |  self_protection   ||CONFIG_CC_STACKPROTECTOR_STRONG: OK ("y")
   CONFIG_VMAP_STACK                      |      y      | ubuntu18 |  self_protection   ||             OK             
   CONFIG_THREAD_INFO_IN_TASK             |      y      | ubuntu18 |  self_protection   ||             OK             
   CONFIG_SCHED_STACK_END_CHECK           |      y      | ubuntu18 |  self_protection   ||             OK             

diff --git a/kconfig-hardened-check.py b/kconfig-hardened-check.py
index e8b846cd142540727490c0ffe1dfc23140b7ba81..7ceb95d7506e2c1e30417df44b856ff42d785744 100755 (executable)
--- a/kconfig-hardened-check.py
+++ b/kconfig-hardened-check.py
@@ -107,8 +107,8 @@ def construct_opt_checks():
     checklist.append(OptCheck('DEBUG_WX',                'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('RANDOMIZE_BASE',          'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('RANDOMIZE_MEMORY',        'y', 'ubuntu18', 'self_protection'))
-    checklist.append(OptCheck('CC_STACKPROTECTOR',       'y', 'ubuntu18', 'self_protection'))
-    checklist.append(OptCheck('CC_STACKPROTECTOR_STRONG','y', 'ubuntu18', 'self_protection'))
+    checklist.append(OR(OptCheck('STACKPROTECTOR_STRONG','y', 'ubuntu18', 'self_protection'), \
+                     OptCheck('CC_STACKPROTECTOR_STRONG','y', 'ubuntu18', 'self_protection')))
     checklist.append(OptCheck('VMAP_STACK',              'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('THREAD_INFO_IN_TASK',     'y', 'ubuntu18', 'self_protection'))
     checklist.append(OptCheck('SCHED_STACK_END_CHECK',   'y', 'ubuntu18', 'self_protection'))