commit b9462c13bbc2c20eb0dfa9575e36d1d0b06f7569
author Keith Mok <keithmok@google.com> Thu Nov 11 19:34:26 2021 +0000
committer Keith Mok <keithmok@google.com> Fri Nov 12 22:42:53 2021 +0000
tree c79d3cb4f4b339e96c57303a163c5b3c5c4f4334
parent 4f26117d27096873bffb6052f9e0f33c272a7bbd

Fix EINTR received in getrandom

When EINTR received in getrandom,
we should just continue the loop

Bug: 206003134
Test: Manual
Change-Id: Ibdf8050d272ca85355d40b4770b97bad3b9da82c

provisioner/rkp_factory_extraction_tool.cpp

diff --git a/provisioner/rkp_factory_extraction_tool.cpp b/provisioner/rkp_factory_extraction_tool.cpp
index 2e59dbd..9786c3d 100644
--- a/provisioner/rkp_factory_extraction_tool.cpp
+++ b/provisioner/rkp_factory_extraction_tool.cpp
@@ -77,9 +77,13 @@
     uint8_t* writePtr = challenge.data();
     while (bytesRemaining > 0) {
         int bytesRead = getrandom(writePtr, bytesRemaining, /*flags=*/0);
-        if (bytesRead < 0 && errno != EINTR) {
-            std::cerr << errno << ": " << strerror(errno) << std::endl;
-            exit(-1);
+        if (bytesRead < 0) {
+            if (errno == EINTR) {
+                continue;
+            } else {
+                std::cerr << errno << ": " << strerror(errno) << std::endl;
+                exit(-1);
+            }
         }
         bytesRemaining -= bytesRead;
         writePtr += bytesRead;
@@ -158,7 +162,7 @@
     auto rkp_service = IRemotelyProvisionedComponent::fromBinder(rkp_binder);
     if (!rkp_service) {
         std::cerr << "Unable to get binder object for '" << fullName << "', skipping.";
-        return;
+        exit(-1);
     }
 
     std::vector<uint8_t> keysToSignMac;