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

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

Merge "logd: klogd crash (part deux)" am: 96c36d35 am: e36dbdda am: 6d2e1c73 

am: f9fb584b

Change-Id: I6c023c43d6918ae99c368d9a8f9d4253f219689e
parents 7b461063 f9fb584b

logd/LogKlog.cpp

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <syslog.h>



#include <log/logger.h>

#include <private/android_filesystem_config.h>



#include "LogBuffer.h"

#include "LogKlog.h"
@@ -614,7 +615,12 @@ int LogKlog::log(const char *buf, size_t len) { 
    // Parse pid, tid and uid

    const pid_t pid = sniffPid(&p, len - (p - buf));

    const pid_t tid = pid;

    const uid_t uid = pid ? logbuf->pidToUid(pid) : 0;

    uid_t uid = AID_ROOT;

    if (pid) {

        logbuf->lock();

        uid = logbuf->pidToUid(pid);

        logbuf->unlock();

    }



    // Parse (rules at top) to pull out a tag from the incoming kernel message.

    // Some may view the following as an ugly heuristic, the desire is to