commit a9963dcfb72a36c58bf5fc119deb3ffa28025bab
author Arve Hjnnevg <arve@android.com> Tue Aug 09 20:46:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 20:46:49 2016 +0000
tree 23e9e0ab1420bf79ee6e1c6d7960f843ae4415a5
parent fd579a51b5787bef19a6f5c2b27fce44db0b05d9
parent f03ba2c0d878071603d73b7f8e9a4a468364ac27

DO NOT MERGE ServiceManager: Restore basic uid check
am: f03ba2c0d8

Change-Id: I1435bfcd119116cdd242cf7714ef9535d7abc6fa

cmds/servicemanager/service_manager.c

diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 7fa9a39..4c993c2 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -107,9 +107,14 @@
     return allowed;
 }
 
-static int svc_can_register(const uint16_t *name, size_t name_len, pid_t spid)
+static int svc_can_register(const uint16_t *name, size_t name_len, pid_t spid, uid_t uid)
 {
     const char *perm = "add";
+
+    if (uid >= AID_APP) {
+        return 0; /* Don't allow apps to register services */
+    }
+
     return check_mac_perms_from_lookup(spid, perm, str8(name, name_len)) ? 1 : 0;
 }
 
@@ -204,7 +209,7 @@
     if (!handle || (len == 0) || (len > 127))
         return -1;
 
-    if (!svc_can_register(s, len, spid)) {
+    if (!svc_can_register(s, len, spid, uid)) {
         ALOGE("add_service('%s',%x) uid=%d - PERMISSION DENIED\n",
              str8(s, len), handle, uid);
         return -1;