summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2008-04-15 00:07:15 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-15 00:07:15 -0700
commita198d3a200313bca8261e30e6daaad790937fd7e (patch)
treeb6a47a0bd1056c2b30b3bdd2e9ba0c91fa4f6301 /net/tipc
parent990098068fe963f956c14f681bd88d90dcb14584 (diff)
downloadlinux-3.10-a198d3a200313bca8261e30e6daaad790937fd7e.tar.gz
linux-3.10-a198d3a200313bca8261e30e6daaad790937fd7e.tar.bz2
linux-3.10-a198d3a200313bca8261e30e6daaad790937fd7e.zip
[TIPC]: Allow stream receive to read from multiple TIPC messages
This patch allows a stream socket to receive data from multiple TIPC messages in its receive queue, without requiring the use of the MSG_WAITALL flag. Acknowledgements to Florian Westphal <fw-tipc@strlen.de> for identifying this issue and suggesting how to correct it. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/socket.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 91aa2dc5177..c1a199c0fa6 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1065,7 +1065,9 @@ restart:
/* Loop around if more data is required */
if ((sz_copied < buf_len) /* didn't get all requested data */
- && (flags & MSG_WAITALL) /* ... and need to wait for more */
+ && (!skb_queue_empty(&sock->sk->sk_receive_queue) ||
+ (flags & MSG_WAITALL))
+ /* ... and more is ready or required */
&& (!(flags & MSG_PEEK)) /* ... and aren't just peeking at data */
&& (!err) /* ... and haven't reached a FIN */
)