Changeset 83520 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 3, 2020 8:33:32 AM (5 years ago)

Author:

vboxsync

Message:

Runtime/r3/serialport-posix: More error checking, read/write methods should return an error if read() or write() return 0 bytes as this indicate an end of file condition which is an error for serial ports, and check for the POLLERR flag first before checking POLLIN (as both get set)

File:

• trunk/src/VBox/Runtime/r3/posix/serialport-posix.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/r3/posix/serialport-posix.cpp

@@ -822 +822 @@
          */
         ssize_t cbRead = read(pThis->iFd, pvBuf, cbToRead);
-        if (cbRead >= 0)
+        if (cbRead > 0)
         {
             if (pcbRead)
@@ -835 +835 @@
                     if (cbReadPart < 0)
                         return RTErrConvertFromErrno(errno);
+                    else if (cbReadPart == 0)
+                        return VERR_DEV_IO_ERROR;
 
                     cbRead += cbReadPart;
@@ -840 +842 @@
             }
         }
+        else if (cbRead == 0)
+            rc = VERR_DEV_IO_ERROR;
         else
             rc = RTErrConvertFromErrno(errno);
@@ -874 +878 @@
             *pcbRead = cbThisRead;
         }
-        else if (cbThisRead == 0 || errno == EAGAIN || errno == EWOULDBLOCK)
+        else if (cbThisRead == 0)
+            rc = VERR_DEV_IO_ERROR;
+        else if (   errno == EAGAIN
+# ifdef EWOULDBLOCK
+#  if EWOULDBLOCK != EAGAIN
+                 || errno == EWOULDBLOCK
+#  endif
+# endif
+                )
             rc = VINF_TRY_AGAIN;
         else
@@ -899 +911 @@
          */
         ssize_t cbWritten = write(pThis->iFd, pvBuf, cbToWrite);
-        if (cbWritten >= 0)
+        if (cbWritten > 0)
         {
             if (pcbWritten)
@@ -912 +924 @@
                     if (cbWrittenPart < 0)
                         return RTErrConvertFromErrno(errno);
+                    else if (cbWrittenPart == 0)
+                        return VERR_DEV_IO_ERROR;
                     cbWritten += cbWrittenPart;
                 }
             }
         }
+        else if (cbWritten == 0)
+            rc = VERR_DEV_IO_ERROR;
+        else
+            rc = RTErrConvertFromErrno(errno);
     }
 
@@ -939 +957 @@
         if (cbThisWrite > 0)
             *pcbWritten = cbThisWrite;
-        else if (cbThisWrite == 0 || errno == EAGAIN || errno == EWOULDBLOCK)
+        else if (cbThisWrite == 0)
+            rc = VERR_DEV_IO_ERROR;
+        else if (   errno == EAGAIN
+# ifdef EWOULDBLOCK
+#  if EWOULDBLOCK != EAGAIN
+                 || errno == EWOULDBLOCK
+#  endif
+# endif
+                )
             rc = VINF_TRY_AGAIN;
         else
@@ -1092 +1118 @@
             if (aPollFds[0].revents != 0)
             {
-                fEvtsPending |= (aPollFds[0].revents & POLLIN) ? RTSERIALPORT_EVT_F_DATA_RX : 0;
-                fEvtsPending |= (aPollFds[0].revents & POLLOUT) ? RTSERIALPORT_EVT_F_DATA_TX : 0;
-                /** @todo BREAK condition detection. */
+                if (aPollFds[0].revents & POLLERR)
+                    rc = VERR_DEV_IO_ERROR;
+                else
+                {
+                    fEvtsPending |= (aPollFds[0].revents & POLLIN) ? RTSERIALPORT_EVT_F_DATA_RX : 0;
+                    fEvtsPending |= (aPollFds[0].revents & POLLOUT) ? RTSERIALPORT_EVT_F_DATA_TX : 0;
+                    /** @todo BREAK condition detection. */
+                }
             }