commit f32881a401701b40b1d518676dae99a31b8f4764
author Sandeep Patil <sspatil@google.com> Wed Jan 18 00:46:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 00:46:46 2017 +0000
tree eadba2129a8a4aedc80a1f4fa24efafef423a823
parent 9eeb77f0dde6e61fa8fafef7869fcae19f683a75
parent a7575ec40f3285712143c3387c97c1235d278dab

Merge "servicemanager: selinux: set selinux callbacks early" am: bfbe2d711c
am: a7575ec40f

Change-Id: Id220cef18e1b003f5c0edd3a8da4d2871d2055a9

cmds/servicemanager/service_manager.c

diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index a31e3c7..43c4c8b 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -363,6 +363,7 @@
 int main()
 {
     struct binder_state *bs;
+    union selinux_callback cb;
 
     bs = binder_open(128*1024);
     if (!bs) {
@@ -375,6 +376,11 @@
         return -1;
     }
 
+    cb.func_audit = audit_callback;
+    selinux_set_callback(SELINUX_CB_AUDIT, cb);
+    cb.func_log = selinux_log_callback;
+    selinux_set_callback(SELINUX_CB_LOG, cb);
+
     sehandle = selinux_android_service_context_handle();
     selinux_status_open(true);
 
@@ -388,11 +394,6 @@
         abort();
     }
 
-    union selinux_callback cb;
-    cb.func_audit = audit_callback;
-    selinux_set_callback(SELINUX_CB_AUDIT, cb);
-    cb.func_log = selinux_log_callback;
-    selinux_set_callback(SELINUX_CB_LOG, cb);
 
     binder_loop(bs, svcmgr_handler);