summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2014-03-26 09:30:37 -0400
committerStephen Smalley <sds@tycho.nsa.gov>2014-03-26 09:31:25 -0400
commit7abb52bcafa2f7b422dfe22c5ea275c2fa9e6201 (patch)
treeeb88462af949cfa720c919426d2daa38aabe2bc9
parent01502981cddb69b9ab7e4bf8bc66366ae0eb7035 (diff)
downloadnative-7abb52bcafa2f7b422dfe22c5ea275c2fa9e6201.tar.gz
Send libselinux logging to logcat.
Otherwise we can't readily see log messages from libselinux calls made by installd. Change-Id: I319b30c181470468fe19dd5fbe9251ef03f1163b Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
-rw-r--r--cmds/installd/installd.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
index 40fc13f0eb..a080ee6185 100644
--- a/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@ -541,6 +541,27 @@ static void drop_privileges() {
}
}
+static int log_callback(int type, const char *fmt, ...) {
+ va_list ap;
+ int priority;
+
+ switch (type) {
+ case SELINUX_WARNING:
+ priority = ANDROID_LOG_WARN;
+ break;
+ case SELINUX_INFO:
+ priority = ANDROID_LOG_INFO;
+ break;
+ default:
+ priority = ANDROID_LOG_ERROR;
+ break;
+ }
+ va_start(ap, fmt);
+ LOG_PRI_VA(priority, "SELinux", fmt, ap);
+ va_end(ap);
+ return 0;
+}
+
int main(const int argc, const char *argv[]) {
char buf[BUFFER_MAX];
struct sockaddr addr;
@@ -550,6 +571,10 @@ int main(const int argc, const char *argv[]) {
ALOGI("installd firing up\n");
+ union selinux_callback cb;
+ cb.func_log = log_callback;
+ selinux_set_callback(SELINUX_CB_LOG, cb);
+
if (initialize_globals() < 0) {
ALOGE("Could not initialize globals; exiting.\n");
exit(1);