From e2eca564bfb6d3dd93ab99666025d5ba59714f5b Mon Sep 17 00:00:00 2001
From: Serdar Kocdemir <kocdemir@google.com>
Date: Tue, 14 Mar 2023 14:58:30 +0000
Subject: Changing OWNERS for gpuservice tests

Bug: b/248501602
Test: atest GpuWorkTracepointTest

Change-Id: Ifc4677d38fd90a923846e19a3b59b2effeb60984
---
 services/gpuservice/vts/OWNERS | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.3


From ca8d670c1656a6a47ef0f31fdfe1744d75fe5543 Mon Sep 17 00:00:00 2001
From: tyiu <tyiu@google.com>
Date: Tue, 21 Feb 2023 22:38:32 +0000
Subject: RESTRICT AUTOMERGE: Fix HMAC Compare time attack

Added constant time HMAC comparison preventing attackers being able to
forge HMAC for input by measuring the time difference between
non-constant time comparison of HMAC

Bug: 261085213
Test: None
Tag: #security
Change-Id: I7cd6b68589fd0042b9396dc599b917a0f3220ff7
---
 services/inputflinger/dispatcher/InputDispatcher.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
-- 
cgit v1.2.3