commit 11ab583834afc0db85b1191e91ab439f1fa9024e
author Fabien Sanglard <sanglardf@google.com> Thu Feb 02 01:27:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 01:27:03 2017 +0000
tree ee39dedb7019498e73be9b740a5ec2be3abf0798
parent 275c9f60f94780bd686eca9750ec41cc1fafa333
parent 2ae83f4f628d4da96f363d0668380ba1f753b867

Fix security vulnerability
am: 2ae83f4f62

Change-Id: Ie0590dbb8429b5b289f3095055abdc8d29b95a7f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 9d94c87..b62e701 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1912,8 +1912,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);
                 }