openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "liblog: logprint security ANDROID_LOG_WARN" am: d2d35df279 

am: 6a92853230

* commit '6a9285323089fe9b95a5ae53989d3d660dc14291':
  liblog: logprint security ANDROID_LOG_WARN
This commit is contained in:
Mark Salyzyn 2015-12-11 14:19:16 -08:00 committed by android-build-merger
parent bcac4a98d4 6a92853230
commit fdb0286108
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
liblog/logprint.c
View File

@ -750,12 +750,17 @@ int android_log_processBinaryLogBuffer(struct logger_entry *buf,
entry->tid = buf->tid;
/*
* Pull the tag out.
* Pull the tag out, fill in some additional details based on incoming
* buffer version (v3 adds lid, v4 adds uid).
*/
eventData = (const unsigned char*) buf->msg;
struct logger_entry_v2 *buf2 = (struct logger_entry_v2 *)buf;
if (buf2->hdr_size) {
eventData = ((unsigned char *)buf2) + buf2->hdr_size;
if ((buf2->hdr_size >= sizeof(struct logger_entry_v3)) &&
(((struct logger_entry_v3 *)buf)->lid == LOG_ID_SECURITY)) {
entry->priority = ANDROID_LOG_WARN;
}
if (buf2->hdr_size >= sizeof(struct logger_entry_v4)) {
entry->uid = ((struct logger_entry_v4 *)buf)->uid;
}