commit 76a60834c510933899eb63bcab114e5d9a0bb27e
author Mark Salyzyn <salyzyn@google.com> Fri Nov 04 14:57:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 04 14:57:08 2016 +0000
tree 85fd8c27789ccb62a7a81b77e9a186297acb673e
parent 39d69112191bcb5ff1e33b817bbb67efacb361cd
parent c4efa3700cf43255acf4e8df08f450df3502941d

logd: auditd + klogd control CAPS am: d2b3291ffa am: 3d2c4829a0
am: 6ad039b9ad

Change-Id: I5fac13cb4ea31bf6f08484217e828bad31ec998c

logd/main.cpp

diff --git a/logd/main.cpp b/logd/main.cpp
index 770aa25..99ad080 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -89,7 +89,7 @@
 //    logd
 //
 
-static int drop_privs() {
+static int drop_privs(bool klogd, bool auditd) {
     struct sched_param param;
     memset(&param, 0, sizeof(param));
 
@@ -119,8 +119,8 @@
     if (cap_clear(caps.get()) < 0) return -1;
     cap_value_t cap_value[] = {
         CAP_SETGID, // must be first for below
-        CAP_SYSLOG,
-        CAP_AUDIT_CONTROL
+        klogd ? CAP_SYSLOG : CAP_SETGID,
+        auditd ? CAP_AUDIT_CONTROL : CAP_SETGID
     };
     if (cap_set_flag(caps.get(), CAP_PERMITTED,
                      arraysize(cap_value), cap_value,
@@ -444,7 +444,10 @@
         pthread_attr_destroy(&attr);
     }
 
-    if (drop_privs() != 0) {
+    bool auditd = __android_logger_property_get_bool("logd.auditd",
+                                                     BOOL_DEFAULT_TRUE |
+                                                     BOOL_DEFAULT_FLAG_PERSIST);
+    if (drop_privs(klogd, auditd) != 0) {
         return -1;
     }
 
@@ -499,9 +502,6 @@
     // initiated log messages. New log entries are added to LogBuffer
     // and LogReader is notified to send updates to connected clients.
 
-    bool auditd = __android_logger_property_get_bool("logd.auditd",
-                                                     BOOL_DEFAULT_TRUE |
-                                                     BOOL_DEFAULT_FLAG_PERSIST);
     LogAudit *al = NULL;
     if (auditd) {
         al = new LogAudit(logBuf, reader,