summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTri Vo <trong@google.com>2019-03-25 10:34:34 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-25 10:34:34 -0700
commit5e682c2851eb5951d08083b5ee7acde2537f473d (patch)
treef4f018d7160aeed26de6c6647023269b99a68626
parent0d7dfbd354921a8c38ddc736fd598bb95cbb8d37 (diff)
parent41b7c708217752a4b30cc022b5917957274c47e2 (diff)
downloadashmemd-5e682c2851eb5951d08083b5ee7acde2537f473d.tar.gz
Check /dev/binder access before calling defaultServiceManager()
am: 41b7c70821 Change-Id: Idfe934eb2e7339b7bfbbd4fbfaacbcce670baf72
-rw-r--r--ashmemd_client.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/ashmemd_client.cpp b/ashmemd_client.cpp
index 3380209..04227ba 100644
--- a/ashmemd_client.cpp
+++ b/ashmemd_client.cpp
@@ -28,6 +28,11 @@ namespace android {
namespace ashmemd {
sp<IAshmemDeviceService> getAshmemService() {
+ // Calls to defaultServiceManager() crash the process if it doesn't have appropriate
+ // binder permissions. Check these permissions proactively.
+ if (access("/dev/binder", R_OK | W_OK) != 0) {
+ return nullptr;
+ }
sp<IServiceManager> sm = android::defaultServiceManager();
sp<IBinder> binder = sm->checkService(String16("ashmem_device_service"));
return interface_cast<IAshmemDeviceService>(binder);