[IPV4]: Do not return -EAGAIN on blocking UDP socket, noticed by Olaf Kirch.

62bc1c6d · David S. Miller · Benjamin Herrenschmidt · 45cf898b · 62bc1c6d
Commit 62bc1c6d authored Feb 20, 2004 by David S. Miller Committed by Benjamin Herrenschmidt Feb 20, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

net/ipv4/udp.c net/ipv4/udp.c +4 -1

No files found.
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -787,6 +787,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	if (flags & MSG_ERRQUEUE)
 		return ip_recv_error(sk, msg, len);
+try_again:
 	skb = skb_recv_datagram(sk, flags, noblock, &err);
 	if (!skb)
 		goto out;
@@ -852,7 +853,9 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	skb_free_datagram(sk, skb);
-	return -EAGAIN;	
+	if (noblock)
+		return -EAGAIN;	
+	goto try_again;
 }
 int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)