commit f72f0f1ff0eeab34677762cf00f0ff6e55ba8d97
author Eran Messeri <eranm@google.com> Thu Dec 14 20:04:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 14 20:04:35 2017 +0000
tree 04bbdf95a8eefc07a2610cf125ce785b376cf88b
parent 9f9728661b07bda7a9cdcac0a77693a9533a5bf4
parent ea47d3f78bd6902e406f5faf84a5477112f10e3e

Merge "Keystore: Enable key attestation from the system context."

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index ac10921..b309ad6 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -814,7 +814,7 @@
 
     if (containsTag(params.getParameters(), Tag::INCLUDE_UNIQUE_ID)) {
         //TODO(jbires): remove uid checking upon implementation of b/25646100
-        if (!checkBinderPermission(P_GEN_UNIQUE_ID) &&
+        if (!checkBinderPermission(P_GEN_UNIQUE_ID) ||
             originalUid != IPCThreadState::self()->getCallingUid()) {
             *aidl_return = static_cast<int32_t>(ResponseCode::PERMISSION_DENIED);
             return Status::ok();