issue: 2439102 Fix issue with processing control msg in recvmsg()

Control message should be handled just in case an user passes a buffer for it. Error queue request must be processed first before data. Signed-off-by: Igor Ivanov <[email protected]>
Mellanox · Feb 20, 2021 · 07a71ec · 07a71ec
1 parent d2db645
commit 07a71ec
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/vma/sock/sockinfo_tcp.cpp b/src/vma/sock/sockinfo_tcp.cpp
@@ -1957,9 +1957,13 @@ ssize_t sockinfo_tcp::rx(const rx_call_t call_type, iovec* p_iov, ssize_t sz_iov
 
 	/* poll rx queue till we have something */
 	lock_tcp_con();
-	if (__msg) {
-		handle_cmsg(__msg, in_flags);
-		if (__msg->msg_controllen == 0) {
+
+	/* error queue request should be handled first
+	 * It allows to return immediately during failure with correct
+	 * error notification without data processing
+	 */
+	if (__msg && __msg->msg_control && (in_flags & MSG_ERRQUEUE)) {
+		if (m_error_queue.empty()) {
 			errno = EAGAIN;
 			unlock_tcp_con();
 			return -1;
@@ -1982,6 +1986,11 @@ ssize_t sockinfo_tcp::rx(const rx_call_t call_type, iovec* p_iov, ssize_t sz_iov
 		total_rx = dequeue_packet(p_iov, sz_iov, (sockaddr_in *)__from, __fromlen, in_flags, &out_flags);
 	}
 
+	/* Handle all control message requests */
+	if (__msg && __msg->msg_control) {
+		handle_cmsg(__msg, in_flags);
+	}
+
 	/*
 	* RCVBUFF Accounting: Going 'out' of the internal buffer: if some bytes are not tcp_recved yet  - do that.
 	* The packet might not be 'acked' (tcp_recved)