commit 33783fc29c4235822516e90277632b9bbef1c982
author Ravi Kumar Siddojigari <rsiddoji@codeaurora.org> Tue Jul 30 16:41:20 2019 +0530
committer Jeff Vander Stoep <jeffv@google.com> Wed Aug 28 14:28:08 2019 +0200
tree f97da0e115f7858df3f6bf0a084a5fc36ae911b8
parent 3bd09415a3f859467fae2b1516ffa3e95431bfa0

init: set SetKptrRestrict before early-init

As part of debugging long run issue we are enabling
module info as part of debug build under the config key
DEBUG_MODULE_LOAD_INFO , But doing so can lead to info leak
as modules/dlkm are loaded in early-init and setting the
kptr_restriction is done after early-init.

So moving setting of kptr_restrict much before early-init.

Bug: 138641073

Change-Id: Ic3c0ca57a94c8b20136a15331dd646bd8825b625

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index e8eb571..3432e24 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -771,6 +771,7 @@
 
     am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");
 
+    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");
     am.QueueEventTrigger("early-init");
 
     // Queue an action that waits for coldboot done so we know ueventd has set up all of /dev...
@@ -778,7 +779,6 @@
     // ... so that we can start queuing up actions that require stuff from /dev.
     am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng");
     am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits");
-    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");
     Keychords keychords;
     am.QueueBuiltinAction(
             [&epoll, &keychords](const BuiltinArguments& args) -> Result<void> {