Index: uspace/srv/net/socket/socket_client.c
===================================================================
--- uspace/srv/net/socket/socket_client.c	(revision 11485d0c01a12be631a93f082f935310de171f31)
+++ uspace/srv/net/socket/socket_client.c	(revision 8ab2074553d5ff397241a46282b4c850937166c2)
@@ -762,5 +762,8 @@
 		fibril_rwlock_read_unlock( & socket_globals.lock );
 		fibril_condvar_wait( & socket->receive_signal, & socket->receive_lock );
+		// drop the receive lock to avoid deadlock
+		fibril_mutex_unlock( & socket->receive_lock );
 		fibril_rwlock_read_lock( & socket_globals.lock );
+		fibril_mutex_lock( & socket->receive_lock );
 	}
 	-- socket->blocked;