Properly checking the return value of ipc_sendrecv_with_fds

commaai · Aug 8, 2024 · c7d540a · c7d540a
1 parent 23cb05a
commit c7d540a
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/msgq/visionipc/visionipc_client.cc b/msgq/visionipc/visionipc_client.cc
@@ -48,14 +48,22 @@ bool VisionIpcClient::connect(bool blocking){
   }
   // Send stream type to server to request FDs
   int r = ipc_sendrecv_with_fds(true, socket_fd, &type, sizeof(type), nullptr, 0, nullptr);
+  if (r <= 0) {
+    close(socket_fd);
+    return false;
+  }
+
   assert(r == sizeof(type));
 
   // Get FDs
   int fds[VISIONIPC_MAX_FDS];
   VisionBuf bufs[VISIONIPC_MAX_FDS];
   r = ipc_sendrecv_with_fds(false, socket_fd, &bufs, sizeof(bufs), fds, VISIONIPC_MAX_FDS, &num_buffers);
+  if (r <= 0) {
+    close(socket_fd);
+    return false;
+  }
 
-  assert(num_buffers >= 0);
   assert(r == sizeof(VisionBuf) * num_buffers);
 
   // Import buffers
@@ -122,11 +130,19 @@ std::set<VisionStreamType> VisionIpcClient::getAvailableStreams(const std::strin
   // Send VISION_STREAM_MAX to server to request available streams
   int request = VISION_STREAM_MAX;
   int r = ipc_sendrecv_with_fds(true, socket_fd, &request, sizeof(request), nullptr, 0, nullptr);
-  assert(r == sizeof(request));
+  if (r <= 0) {
+    close(socket_fd);
+    return {};
+  }
 
   VisionStreamType available_streams[VISION_STREAM_MAX] = {};
   r = ipc_sendrecv_with_fds(false, socket_fd, &available_streams, sizeof(available_streams), nullptr, 0, nullptr);
-  assert((r >= 0) && (r % sizeof(VisionStreamType) == 0));
+  if (r <= 0) {
+    close(socket_fd);
+    return {};
+  }
+
+  assert((r % sizeof(VisionStreamType)) == 0);
   close(socket_fd);
   return std::set<VisionStreamType>(available_streams, available_streams + r / sizeof(VisionStreamType));
 }