commit 50a5f15f5fb4b7aea96172851f3bff89b99d70ae
author Liening.Liu <Liening.Liu@unisoc.com> Fri Apr 28 16:27:20 2023 +0800
committer David Zeuthen <zeuthen@google.com> Mon May 01 16:05:06 2023 +0000
tree dae27172d03ff0737f72e3e717012780b4ec8a3f
parent f20c0ddd095013f983d0f73aee0285331bfae4e3

Fix the overflow when converting current time to milliseconds on 32bit system

Test: Vts/Cts

Bug: 279998685
Change-Id: If8df10e7bb04527e1d9d18f03439bae4ca8dc8fa

identity/CredentialData.cpp

diff --git a/identity/CredentialData.cpp b/identity/CredentialData.cpp
index 1bf1527..803e671 100644
--- a/identity/CredentialData.cpp
+++ b/identity/CredentialData.cpp
@@ -520,8 +520,12 @@
                                           bool allowUsingExpiredKeys) {
     AuthKeyData* candidate = nullptr;
 
-    int64_t nowMilliSeconds =
-        std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) * 1000;
+    time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+    int64_t nowMilliSeconds;
+    if (__builtin_mul_overflow(int64_t(now), int64_t(1000), &nowMilliSeconds)) {
+        LOG(ERROR) << "Overflow converting " << now << " to milliseconds";
+        return nullptr;
+    }
 
     int n = 0;
     for (AuthKeyData& data : authKeyDatas_) {