commit c18ffb3bd37e2e99152a87d3ff3f2d900593ef95
author Max Bires <jbires@google.com> Wed Dec 13 18:36:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 13 18:36:39 2017 +0000
tree 5ae756717fa52c9b5033fcf6f30c23594dea5dd0
parent be5b449337e48039f03e421d24f57cff7d630ca1
parent 1e6d4bfd3ec754346d9b880bc7ead8985609249c

Fixing bug in security vulnerability patch
am: 1e6d4bfd3e

Change-Id: I7f603c34b5c3187d7d1b6dda12e4a3a87fa0e653

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 5d505ae..4cca5ae 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -703,9 +703,8 @@
         ALOGE("Non-system uid %d cannot set FLAG_CRITICAL_TO_DEVICE_ENCRYPTION", uid);
         return ResponseCode::PERMISSION_DENIED;
     }
-
     if (containsTag(params, Tag::INCLUDE_UNIQUE_ID)) {
-        if (!checkBinderPermission(P_GEN_UNIQUE_ID) &&
+        if (!checkBinderPermission(P_GEN_UNIQUE_ID) ||
               originalUid != IPCThreadState::self()->getCallingUid()) {
             return ResponseCode::PERMISSION_DENIED;
         }