diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-05 00:42:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-05 00:42:00 +0000 |
| commit | 3b2176da702dec1a5b0acc9167a5cc9b345c2d6f (patch) | |
| tree | 5eb6a0b527bb112f63558135826ca829ca77334d | |
| parent | f5b58032f74d2346af37bcedc7685ebcde26fc33 (diff) | |
| parent | 82582195634d9339f2aa3db9cd77a2708db324f0 (diff) | |
| download | native-android13-mainline-os-statsd-release.tar.gz | |
Snap for 9884511 from 82582195634d9339f2aa3db9cd77a2708db324f0 to mainline-os-statsd-releaseaml_sta_331910000aml_sta_331811000android13-mainline-os-statsd-release
Change-Id: I661c3f96077e9773a8e2c44ec065249257f227f3
| -rw-r--r-- | services/gpuservice/vts/OWNERS | 1 | ||||
| -rw-r--r-- | services/inputflinger/dispatcher/InputDispatcher.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/services/gpuservice/vts/OWNERS b/services/gpuservice/vts/OWNERS index e789052fa3..a63de1c306 100644 --- a/services/gpuservice/vts/OWNERS +++ b/services/gpuservice/vts/OWNERS @@ -1,4 +1,5 @@ # Bug component: 653544 +kocdemir@google.com paulthomson@google.com pbaiget@google.com lfy@google.com 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; |