commit ac2b87ac0f613f9995b938a9157544cdd2dbe646
author Fabien Sanglard <sanglardf@google.com> Thu Feb 02 01:29:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 01:29:02 2017 +0000
tree 57dfff9943b908c0192e9f30aa62a9fae067dfb0
parent 853702ce3d1ba5e45ce58f332ed1d40008a44375
parent 11ab583834afc0db85b1191e91ab439f1fa9024e

Fix security vulnerability am: 2ae83f4f62
am: 11ab583834

Change-Id: I09ec85b9f83e1f4458940415cd07f6fca725c552

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 13a63c4..683c787 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1788,8 +1788,7 @@
         if (s.client != NULL) {
             sp<IBinder> binder = s.client->asBinder();
             if (binder != NULL) {
-                String16 desc(binder->getInterfaceDescriptor());
-                if (desc == ISurfaceComposerClient::descriptor) {
+                if (binder->queryLocalInterface(ISurfaceComposerClient::descriptor) != NULL) {
                     sp<Client> client( static_cast<Client *>(s.client.get()) );
                     transactionFlags |= setClientStateLocked(client, s.state);
                 }