summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-06 02:59:19 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-06 02:59:19 +0000
commit968b21e5f490f41f17dbdde72a5f99cb113de522 (patch)
tree5eb6a0b527bb112f63558135826ca829ca77334d
parent24f2f7a588ca01c20b9446a16b90fd69ce0dfffb (diff)
parent82582195634d9339f2aa3db9cd77a2708db324f0 (diff)
downloadnative-android13-mainline-permission-release.tar.gz
Snap for 9890127 from 82582195634d9339f2aa3db9cd77a2708db324f0 to mainline-permission-releaseaml_per_331913010aml_per_331812030android13-mainline-permission-release
Change-Id: I96d8a5c68eccb91eb9dc602a939b0a9749cd292e
-rw-r--r--services/inputflinger/dispatcher/InputDispatcher.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 5e9427ad87..da461285f5 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -27,6 +27,7 @@
#include <ftl/enum.h>
#include <gui/SurfaceComposerClient.h>
#include <input/InputDevice.h>
+#include <openssl/mem.h>
#include <powermanager/PowerManager.h>
#include <unistd.h>
#include <utils/Trace.h>
@@ -4422,7 +4423,7 @@ std::unique_ptr<VerifiedInputEvent> InputDispatcher::verifyInputEvent(const Inpu
if (calculatedHmac == INVALID_HMAC) {
return nullptr;
}
- if (calculatedHmac != event.getHmac()) {
+ if (0 != CRYPTO_memcmp(calculatedHmac.data(), event.getHmac().data(), calculatedHmac.size())) {
return nullptr;
}
return result;