commit f3206069d1d05bd45a65732114bc94bccce18a87
author Steven Moreland <smoreland@google.com> Fri Nov 01 16:41:23 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 16:41:23 2019 -0700
tree d215c467de92658025bf85d5129e610c1d8b3ace
parent 305905af098446d0f45dc9fbf98e72e9cf39735b
parent 088c39801860788256ff2f4da508cb09c45138a4

Vintf.cpp null checks for manifests. am: 11d34e2141 am: 193bfb400a
am: 088c398018

Change-Id: Ie0add150b6a66604fda1164abdc8a26c4b3be81a

ServiceManager.cpp

diff --git a/ServiceManager.cpp b/ServiceManager.cpp
index 116969e..991dc36 100644
--- a/ServiceManager.cpp
+++ b/ServiceManager.cpp
@@ -306,6 +306,11 @@
 
     auto pidcon = getBinderCallingContext();
 
+    if (!mAcl.canAdd(IBase::descriptor, pidcon)) {
+        LOG(ERROR) << "Missing permissions to add IBase";
+        return false;
+    }
+
     auto ret = service->interfaceChain([&](const auto &interfaceChain) {
         addSuccess = addImpl(name, service, interfaceChain, pidcon);
     });