commit 67d72dbc8ea341a1d1848d0066291290dd750842
author Davide Guerri <dguerri@fb.com> Thu Dec 22 23:29:21 2016 +0000
committer Philip Tricca <philip.b.tricca@intel.com> Wed Jul 05 08:51:28 2017 -0700
tree 5c5340754c5bc2559d80c0db509886c10f5e5794
parent 93b735eaa5e4fec57e87b6f79a696f76de612b40

Resume on interrupted syscalls

common/sockets.cpp

diff --git a/common/sockets.cpp b/common/sockets.cpp
index 5e66994..19ba7d2 100644
--- a/common/sockets.cpp
+++ b/common/sockets.cpp
@@ -5,6 +5,9 @@
 #ifndef _WIN32
 void WSACleanup() {}
 int WSAGetLastError() { return errno; }
+int wasInterrupted() { return errno == EINTR; }
+#else
+int wasInterrupted() { return 0; }
 #endif
 
 void CloseSockets( SOCKET otherSock, SOCKET tpmSock)
@@ -22,7 +25,13 @@
     for( bytesRead = 0, length = len; bytesRead != len; length -= iResult, bytesRead += iResult )
     {
         iResult = recv( tpmSock, (char *)&( data[bytesRead] ), length, 0);
-        if ((iResult == SOCKET_ERROR) || (!iResult))
+        if (iResult == SOCKET_ERROR)
+        {
+            if (wasInterrupted())
+                continue;
+            return TSS2_TCTI_RC_IO_ERROR;
+        }
+        else if (!iResult)
             return TSS2_TCTI_RC_IO_ERROR;
     }
 
@@ -38,7 +47,12 @@
     {
         iResult = send( tpmSock, (char *)data, len, MSG_NOSIGNAL );
         if (iResult == SOCKET_ERROR)
-            return TSS2_TCTI_RC_IO_ERROR;
+        {
+            if (wasInterrupted())
+                continue;
+            else
+                return TSS2_TCTI_RC_IO_ERROR;
+        }
     }
 
     return TSS2_RC_SUCCESS;