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

Commit 544d196e authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 7480c007: am b2639f40: Merge "Label sockets consistently with the seclabel value if specified." 

# By Stephen Smalley
# Via Android Git Automerger (1) and others
* commit '7480c007':
  Label sockets consistently with the seclabel value if specified.
parents cc62beeb 7480c007

init/init.c

+27 −19
Original line number Diff line number Diff line
@@ -197,6 +197,13 @@ void service_start(struct service *svc, const char *dynamic_args) 
    }



    if (is_selinux_enabled() > 0) {

        if (svc->seclabel) {

            scon = strdup(svc->seclabel);

            if (!scon) {

                ERROR("Out of memory while starting '%s'\n", svc->name);

                return;

            }

        } else {

            char *mycon = NULL, *fcon = NULL;



            INFO("computing context for service '%s'\n", svc->args[0]);
@@ -221,6 +228,7 @@ void service_start(struct service *svc, const char *dynamic_args) 
                return;

            }

        }

    }



    NOTICE("starting '%s'\n", svc->name);