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

Commit c3dff7a5 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "logd: security buffer only AID_SYSTEM reader" 

am: 69ce7c54

* commit '69ce7c54':
  logd: security buffer only AID_SYSTEM reader
parents a64c980d 69ce7c54

logd/LogListener.cpp

+13 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,18 @@ LogListener::LogListener(LogBuffer *buf, LogReader *reader) : 
        reader(reader) {

        reader(reader) {

}

}





static bool clientHasSecurityCredentials(uid_t uid, gid_t gid, pid_t /* pid */) {

    if (uid == AID_SYSTEM) {

        return true;

    }



    if (gid == AID_SYSTEM) {

        return true;

    }



    return false;

}



bool LogListener::onDataAvailable(SocketClient *cli) {

bool LogListener::onDataAvailable(SocketClient *cli) {

    static bool name_set;

    static bool name_set;

    if (!name_set) {

    if (!name_set) {
@@ -98,7 +110,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) { 




    if ((header->id == LOG_ID_SECURITY) &&

    if ((header->id == LOG_ID_SECURITY) &&

            (!__android_log_security() ||

            (!__android_log_security() ||

             !clientHasLogCredentials(cred->uid, cred->gid, cred->pid))) {

             !clientHasSecurityCredentials(cred->uid, cred->gid, cred->pid))) {

        return false;

        return false;

    }

    }