commit bef08b8d1b30976ff273fc9041bc8d934f52fea9
author Nick Kralevich <nnk@google.com> Wed Nov 27 21:09:12 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 27 21:09:13 2013 +0000
tree 9f8511b6eace76407c67c98b1b2e73091e75aa17
parent 63b62e8cd48176abbfddb6bd67c138ae447f6ac7
parent bd558d61871218f5b13df2fe4b7cc3b530ee947c

Merge "Handle policy reloads within installd rather than restarting it."

cmds/installd/installd.c

diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
index a2cbccc..f52cee0 100644
--- a/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@ -16,6 +16,8 @@
 
 #include <sys/capability.h>
 #include <linux/prctl.h>
+#include <selinux/android.h>
+#include <selinux/avc.h>
 
 #include "installd.h"
 
@@ -526,6 +528,7 @@
     struct sockaddr addr;
     socklen_t alen;
     int lsocket, s, count;
+    int selinux_enabled = (is_selinux_enabled() > 0);
 
     ALOGI("installd firing up\n");
 
@@ -539,6 +542,11 @@
         exit(1);
     }
 
+    if (selinux_enabled && selinux_status_open(true) < 0) {
+        ALOGE("Could not open selinux status; exiting.\n");
+        exit(1);
+    }
+
     drop_privileges();
 
     lsocket = android_get_control_socket(SOCKET_PATH);
@@ -577,6 +585,9 @@
                 break;
             }
             buf[count] = 0;
+            if (selinux_enabled && selinux_status_updated() > 0) {
+                selinux_android_seapp_context_reload();
+            }
             if (execute(s, buf)) break;
         }
         ALOGI("closing connection\n");