commit c3dff7a5dc80cd296df001c7ead8a869ca30e640
author Mark Salyzyn <salyzyn@google.com> Tue Jan 26 20:48:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 26 20:48:13 2016 +0000
tree c1cee87733c14742f36003e818d0f9edcf40a455
parent a64c980da92b0ead65756d4e4644a37721673383
parent 69ce7c5483709d2c005ae2c77f89b3c3835e8ba5

Merge "logd: security buffer only AID_SYSTEM reader"
am: 69ce7c5483

* commit '69ce7c5483709d2c005ae2c77f89b3c3835e8ba5':
  logd: security buffer only AID_SYSTEM reader

logd/LogListener.cpp

diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
index 846dd7c..cc6df80 100644
--- a/logd/LogListener.cpp
+++ b/logd/LogListener.cpp
@@ -36,6 +36,18 @@
         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 @@
 
     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;
     }