diff options
| author | Tri Vo <trong@google.com> | 2019-03-27 10:41:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-27 10:41:51 -0700 |
| commit | 3f5816670ee13f3005882fce2a0a78974381e260 (patch) | |
| tree | d8bd391b69d139864072345cfcbac127bc4243a5 | |
| parent | 844b0b7e399d44966343a5edab94ee4ac11886dd (diff) | |
| parent | d16c37d5a02529e13207f2a56c090f58d85d4f02 (diff) | |
| download | ashmemd-3f5816670ee13f3005882fce2a0a78974381e260.tar.gz | |
Merge "Reland 'Check /dev/binder access before calling defaultServiceManager()'" am: 4f42ac7989
am: d16c37d5a0
Change-Id: I624ed23839a297b652701079aab7e6c091eefb4d
| -rw-r--r-- | ashmemd_client.cpp | 5 |
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); |