ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logd: auditd: kmsg priority"

Browse source
This commit is contained in:
Mark Salyzyn 2014-09-19 19:07:29 +00:00 • committed by Gerrit Code Review
commit 810814d09b
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
logd/LogAudit.cpp
View file

@ -31,6 +31,8 @@ LogAudit::LogAudit(LogBuffer *buf, LogReader *reader, int fdDmsg)
, logbuf(buf) , logbuf(buf)
, reader(reader) , reader(reader)
, fdDmesg(-1) { , fdDmesg(-1) {
static const char auditd_message[] = "<6>logd.auditd: start\n";
write(fdDmsg, auditd_message, sizeof(auditd_message));
logDmesg(); logDmesg();
fdDmesg = fdDmsg; fdDmesg = fdDmsg;
} }
@ -75,13 +77,17 @@ int LogAudit::logPrint(const char *fmt, ...) {
memmove(cp, cp + 1, strlen(cp + 1) + 1); memmove(cp, cp + 1, strlen(cp + 1) + 1);
} }
bool info = strstr(str, " permissive=1") || strstr(str, " policy loaded ");
if (fdDmesg >= 0) { if (fdDmesg >= 0) {
struct iovec iov[2]; struct iovec iov[3];
iov[0].iov_base = str; iov[0].iov_base = info ? const_cast<char *>("<6>")
iov[0].iov_len = strlen(str); : const_cast<char *>("<4>");
iov[1].iov_base = const_cast<char *>("\n"); iov[0].iov_len = 3;
iov[1].iov_len = 1; iov[1].iov_base = str;
iov[1].iov_len = strlen(str);
iov[2].iov_base = const_cast<char *>("\n");
iov[2].iov_len = 1;
writev(fdDmesg, iov, sizeof(iov) / sizeof(iov[0])); writev(fdDmesg, iov, sizeof(iov) / sizeof(iov[0]));
} }
@ -175,10 +181,7 @@ int LogAudit::logPrint(const char *fmt, ...) {
if (!newstr) { if (!newstr) {
rc = -ENOMEM; rc = -ENOMEM;
} else { } else {
*newstr = (strstr(str, " permissive=1") *newstr = info ? ANDROID_LOG_INFO : ANDROID_LOG_WARN;
|| strstr(str, " policy loaded "))
? ANDROID_LOG_INFO
: ANDROID_LOG_WARN;
strlcpy(newstr + 1, comm, l); strlcpy(newstr + 1, comm, l);
strncpy(newstr + 1 + l, str, estr - str); strncpy(newstr + 1 + l, str, estr - str);
strcpy(newstr + 1 + l + (estr - str), ecomm); strcpy(newstr + 1 + l + (estr - str), ecomm);