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

Commit 36cf353f authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

sepolicy: renames nonplat_* to vendor_* 

Also fallbacks to nonplat_* if it doesn't exists.

Bug: 64240127
Bug: 70279378
Test: boot bullhead and sailfish
Change-Id: I372b42a3c559ae0f9602163699eaef4df148467b
parent 8fa3e728

init/property_service.cpp

+10 −2
Original line number Original line Diff line number Diff line
@@ -757,13 +757,21 @@ void CreateSerializedPropertyInfo() { 
        // Don't check for failure here, so we always have a sane list of properties.

        // Don't check for failure here, so we always have a sane list of properties.

        // E.g. In case of recovery, the vendor partition will not have mounted and we

        // E.g. In case of recovery, the vendor partition will not have mounted and we

        // still need the system / platform properties to function.

        // still need the system / platform properties to function.

        LoadPropertyInfoFromFile("/vendor/etc/selinux/nonplat_property_contexts", &property_infos);

        if (!LoadPropertyInfoFromFile("/vendor/etc/selinux/vendor_property_contexts",

                                      &property_infos)) {

            // Fallback to nonplat_* if vendor_* doesn't exist.

            LoadPropertyInfoFromFile("/vendor/etc/selinux/nonplat_property_contexts",

                                     &property_infos);

        }

    } else {

    } else {

        if (!LoadPropertyInfoFromFile("/plat_property_contexts", &property_infos)) {

        if (!LoadPropertyInfoFromFile("/plat_property_contexts", &property_infos)) {

            return;

            return;

        }

        }

        if (!LoadPropertyInfoFromFile("/vendor_property_contexts", &property_infos)) {

            // Fallback to nonplat_* if vendor_* doesn't exist.

            LoadPropertyInfoFromFile("/nonplat_property_contexts", &property_infos);

            LoadPropertyInfoFromFile("/nonplat_property_contexts", &property_infos);

        }

        }

    }

    auto serialized_contexts = std::string();

    auto serialized_contexts = std::string();

    auto error = std::string();

    auto error = std::string();

    if (!BuildTrie(property_infos, "u:object_r:default_prop:s0", "\\s*", &serialized_contexts,

    if (!BuildTrie(property_infos, "u:object_r:default_prop:s0", "\\s*", &serialized_contexts,

init/selinux.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -420,14 +420,19 @@ void SelinuxRestoreContext() { 




    selinux_android_restorecon("/plat_file_contexts", 0);

    selinux_android_restorecon("/plat_file_contexts", 0);

    selinux_android_restorecon("/nonplat_file_contexts", 0);

    selinux_android_restorecon("/nonplat_file_contexts", 0);

    selinux_android_restorecon("/vendor_file_contexts", 0);

    selinux_android_restorecon("/plat_property_contexts", 0);

    selinux_android_restorecon("/plat_property_contexts", 0);

    selinux_android_restorecon("/nonplat_property_contexts", 0);

    selinux_android_restorecon("/nonplat_property_contexts", 0);

    selinux_android_restorecon("/vendor_property_contexts", 0);

    selinux_android_restorecon("/plat_seapp_contexts", 0);

    selinux_android_restorecon("/plat_seapp_contexts", 0);

    selinux_android_restorecon("/nonplat_seapp_contexts", 0);

    selinux_android_restorecon("/nonplat_seapp_contexts", 0);

    selinux_android_restorecon("/vendor_seapp_contexts", 0);

    selinux_android_restorecon("/plat_service_contexts", 0);

    selinux_android_restorecon("/plat_service_contexts", 0);

    selinux_android_restorecon("/nonplat_service_contexts", 0);

    selinux_android_restorecon("/nonplat_service_contexts", 0);

    selinux_android_restorecon("/vendor_service_contexts", 0);

    selinux_android_restorecon("/plat_hwservice_contexts", 0);

    selinux_android_restorecon("/plat_hwservice_contexts", 0);

    selinux_android_restorecon("/nonplat_hwservice_contexts", 0);

    selinux_android_restorecon("/nonplat_hwservice_contexts", 0);

    selinux_android_restorecon("/vendor_hwservice_contexts", 0);

    selinux_android_restorecon("/sepolicy", 0);

    selinux_android_restorecon("/sepolicy", 0);

    selinux_android_restorecon("/vndservice_contexts", 0);

    selinux_android_restorecon("/vndservice_contexts", 0);