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

Commit 3104a550 authored by Alistair Delva's avatar Alistair Delva Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bootconfig-selinux-property" am: c19a7dd3 am: aff8b2da 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1624584

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31f9d3b889abdf1f09df3efd520c0061abacde39
parents 696017ac aff8b2da

init/selinux.cpp

+10 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ namespace { 


enum EnforcingStatus { SELINUX_PERMISSIVE, SELINUX_ENFORCING };



EnforcingStatus StatusFromCmdline() {

EnforcingStatus StatusFromProperty() {

    EnforcingStatus status = SELINUX_ENFORCING;



    ImportKernelCmdline([&](const std::string& key, const std::string& value) {
@@ -101,12 +101,20 @@ EnforcingStatus StatusFromCmdline() { 
        }

    });



    if (status == SELINUX_ENFORCING) {

        ImportBootconfig([&](const std::string& key, const std::string& value) {

            if (key == "androidboot.selinux" && value == "permissive") {

                status = SELINUX_PERMISSIVE;

            }

        });

    }



    return status;

}



bool IsEnforcing() {

    if (ALLOW_PERMISSIVE_SELINUX) {

        return StatusFromCmdline() == SELINUX_ENFORCING;

        return StatusFromProperty() == SELINUX_ENFORCING;

    }

    return true;

}