Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f32881a4 authored by Sandeep Patil's avatar Sandeep Patil Committed by android-build-merger
Browse files

Merge "servicemanager: selinux: set selinux callbacks early" am: bfbe2d71 

am: a7575ec4

Change-Id: Id220cef18e1b003f5c0edd3a8da4d2871d2055a9
parents 9eeb77f0 a7575ec4

cmds/servicemanager/service_manager.c

+6 −5
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ static int audit_callback(void *data, __unused security_class_t cls, char *buf, 
int main()

{

    struct binder_state *bs;

    union selinux_callback cb;



    bs = binder_open(128*1024);

    if (!bs) {
@@ -375,6 +376,11 @@ int main() 
        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 @@ int main() 
        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);