commit 02c8c048078213e60789085679724d9528b2163c
author Kees Cook <keescook@chromium.org> Mon Apr 07 13:45:13 2014 -0700
committer Kees Cook <keescook@chromium.org> Tue Apr 22 00:37:19 2014 +0000
tree 91208564f5a306365c2fca0066944b24f8f7d808
parent 75b4f2e75dac9208d9b302a95634ddeefaf2214d

CHERRY-PICK: kernel_ConfigVerify: ARM on 3.8+ now uses DEBUG_RODATA

Switch to expecting CONFIG_DEBUG_RODATA since we're following upstream
more closely now.

BUG=chromium:356988
TEST=passes on spring, nyan, link
CQ-DEPEND=If032764e913bc6855f92f8f9f38ae9f0bf850fa5,Ib25750070317e62ed4f03676c26329c80de16163

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/193493
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>

Change-Id: I2267f0407731b54332d0b31111937dd2e9d1af24
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/196139
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>

client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py

diff --git a/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py b/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
index 171ec13..2ca7247 100644
--- a/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
+++ b/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
@@ -299,19 +299,16 @@
             else:
                 self.has_builtin('X86_64')
 
-        # Security; marks data segments as RO/NX.
-        if self._arch.startswith('arm'):
-            # On ARM RODATA is not a config option, it is hardcoded.
-            self.is_missing('DEBUG_RODATA')
-        else:
-            self.has_builtin('DEBUG_RODATA')
-        # DEBUG_SET_MODULE_RONX exists on all x86 and on ARM in 3.8+.
+        # Security; marks data segments as RO/NX, text as RO.
         if self._arch.startswith('arm'):
             if utils.compare_versions(kernel_ver, "3.8") >= 0:
+                self.has_builtin('DEBUG_RODATA')
                 self.has_builtin('DEBUG_SET_MODULE_RONX')
             else:
+                self.is_missing('DEBUG_RODATA')
                 self.is_missing('DEBUG_SET_MODULE_RONX')
         else:
+            self.has_builtin('DEBUG_RODATA')
             self.has_builtin('DEBUG_SET_MODULE_RONX')
 
         # Kernel: make sure port 0xED is the one used for I/O delay