From 756332e88b98018d82f225c54734be3d76102bfc Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Mon, 25 Jan 2016 07:32:38 -0800
Subject: [PATCH] logd: security buffer only AID_SYSTEM reader

Bug: 26029733
Change-Id: I140e5eb8bb39271fa674744651127e3fc545cbe8
---
 logd/LogListener.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
index 846dd7c41..cc6df8051 100644
--- a/logd/LogListener.cpp
+++ b/logd/LogListener.cpp
@@ -36,6 +36,18 @@ LogListener::LogListener(LogBuffer *buf, LogReader *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) {
     static bool name_set;
     if (!name_set) {
@@ -98,7 +110,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) {
 
     if ((header->id == LOG_ID_SECURITY) &&
             (!__android_log_security() ||
-             !clientHasLogCredentials(cred->uid, cred->gid, cred->pid))) {
+             !clientHasSecurityCredentials(cred->uid, cred->gid, cred->pid))) {
         return false;
     }