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

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

Merge "Revert "logd: liblog: whitelist "snet_event_log""" am: 1a5bac20 

am: db677f2b

* commit 'db677f2b':
  Revert "logd: liblog: whitelist "snet_event_log""
parents ba3e38f9 db677f2b

liblog/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ include $(CLEAR_VARS) 
#       's/^\([0-9]*\)[ \t]*liblog[ \t].*/-DLIBLOG_LOG_TAG=\1/p' \

#       $(LOCAL_PATH)/event.logtags)

# so make sure we do not regret hard-coding it as follows:

liblog_cflags := -DLIBLOG_LOG_TAG=1005 -DSNET_EVENT_LOG_TAG=1397638484

liblog_cflags := -DLIBLOG_LOG_TAG=1005



liblog_host_sources := logd_write.c log_event_write.c fake_log_device.c event.logtags

liblog_target_sources := logd_write.c log_event_write.c event_tag_map.c log_time.cpp log_is_loggable.c

liblog/logd_write.c

+34 −32
Original line number Diff line number Diff line
@@ -221,22 +221,25 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr) 
            return -EPERM;

        }

    } else if (log_id == LOG_ID_EVENTS) {

        static atomic_uintptr_t map;

        int ret;

        const char *tag;

        EventTagMap *m, *f;



        if (vec[0].iov_len < 4) {

            return -EINVAL;

        }

        if (((uint32_t *)vec[0].iov_base)[0] != htole32(SNET_EVENT_LOG_TAG)) {

            static atomic_uintptr_t map;

            int ret;

            const char *tag = NULL;

            EventTagMap *m, *f = NULL;



        tag = NULL;

        f = NULL;

        m = (EventTagMap *)atomic_load(&map);



        if (!m) {

            ret = trylock();

            m = (EventTagMap *)atomic_load(&map); /* trylock flush cache */

            if (!m) {

                m = android_openEventTagMap(EVENT_TAG_MAP_FILE);

                    if (ret) { /* trylock failed, local copy, mark for close */

                if (ret) { /* trylock failed, use local copy, mark for close */

                    f = m;

                } else {

                    if (!m) { /* One chance to open map file */
@@ -263,7 +266,6 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr) 
        if (!ret) {

            return -EPERM;

        }

        }

    } else {

        /* Validate the incoming tag, tag content can not split across iovec */

        char prio = ANDROID_LOG_VERBOSE;

logd/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ LOCAL_SHARED_LIBRARIES := \ 
#  event_flag := $(call event_logtags,auditd)

#  event_flag += $(call event_logtags,logd)

# so make sure we do not regret hard-coding it as follows:

event_flag := -DAUDITD_LOG_TAG=1003 \

              -DLOGD_LOG_TAG=1004 \

              -DSNET_EVENT_LOG_TAG=1397638484

event_flag := -DAUDITD_LOG_TAG=1003 -DLOGD_LOG_TAG=1004



LOCAL_CFLAGS := -Werror $(event_flag)

logd/LogBuffer.cpp

+4 −8
Original line number Diff line number Diff line
@@ -205,20 +205,16 @@ int LogBuffer::log(log_id_t log_id, log_time realtime, 


    LogBufferElement *elem = new LogBufferElement(log_id, realtime,

                                                  uid, pid, tid, msg, len);

    if (log_id != LOG_ID_SECURITY) { // whitelist LOG_ID_SECURITY

    if (log_id != LOG_ID_SECURITY) {

        int prio = ANDROID_LOG_INFO;

        const char *tag = (const char *)-1;

        const char *tag = NULL;

        if (log_id == LOG_ID_EVENTS) {

            // whitelist "snet_event_log"

            if (elem->getTag() != SNET_EVENT_LOG_TAG) {

            tag = android::tagToName(elem->getTag());

            }

        } else {

            prio = *msg;

            tag = msg + 1;

        }

        if ((tag != (const char *)-1) &&

                !__android_log_is_loggable(prio, tag, ANDROID_LOG_VERBOSE)) {

        if (!__android_log_is_loggable(prio, tag, ANDROID_LOG_VERBOSE)) {

            // Log traffic received to total

            pthread_mutex_lock(&mLogElementsLock);

            stats.add(elem);