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

Commit 76417519 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

New "selinux.restorecon" control property. 

This new property is used as a control verb for running a recursive
restorecon at the path contained in the property value.

Shifts both SELinux actions to occur before the actual property set
occurs, so setters can watch for completion.

Bug: 21121357
Change-Id: I3db3eb876ae66e144b3bfd648349b66a028511fd
parent 03196c9c

init/property_service.cpp

+10 −3
Original line number Diff line number Diff line
@@ -205,6 +205,16 @@ static int property_set_impl(const char* name, const char* value) { 
    if (!is_legal_property_name(name, namelen)) return -1;

    if (valuelen >= PROP_VALUE_MAX) return -1;



    if (strcmp("selinux.reload_policy", name) == 0 && strcmp("1", value) == 0) {

        if (selinux_reload_policy() != 0) {

            ERROR("Failed to reload policy\n");

        }

    } else if (strcmp("selinux.restorecon_recursive", name) == 0 && valuelen > 0) {

        if (restorecon_recursive(value) != 0) {

            ERROR("Failed to restorecon_recursive %s\n", value);

        }

    }



    prop_info* pi = (prop_info*) __system_property_find(name);



    if(pi != 0) {
@@ -236,9 +246,6 @@ static int property_set_impl(const char* name, const char* value) { 
         * to prevent them from being overwritten by default values.

         */

        write_persistent_property(name, value);

    } else if (strcmp("selinux.reload_policy", name) == 0 &&

               strcmp("1", value) == 0) {

        selinux_reload_policy();

    }

    property_changed(name, value);

    return 0;