commit 2b85018b12c730de690971f3c58a81e5640e97a6
author Max Bires <jbires@google.com> Wed Dec 13 18:42:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 13 18:42:12 2017 +0000
tree 2c7e3b7fd0de6bd6ee21bdcf8d4c7c0318b94415
parent c5bff0f79849d7f6b1853c8bdf69d977af5209ed
parent fd8d014e0d0d35be1f6dfea4d8e3ad07468fc683

Fixing bug in security vulnerability patch
am: fd8d014e0d

Change-Id: I2c2c2fff90e4da65d50a19200c5643d612b711f5

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index be13a7b..f6786b8 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -705,9 +705,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;
         }