diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2012-10-29 05:05:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-02 22:01:45 -0400 |
| commit | c454e6111d1ef4268fe98e87087216e51c2718c3 (patch) | |
| tree | 76551a3f8a02dc4f8c492e056f9cddc9f7d6243f | |
| parent | a4d7e485bca65bd516fced77b03f92419308df72 (diff) | |
| download | blackbird-op-linux-c454e6111d1ef4268fe98e87087216e51c2718c3.tar.gz blackbird-op-linux-c454e6111d1ef4268fe98e87087216e51c2718c3.zip | |
tcp-repair: Handle zero-length data put in rcv queue
When sending data into a tcp socket in repair state we should check
for the amount of data being 0 explicitly. Otherwise we'll have an skb
with seq == end_seq in rcv queue, but tcp doesn't expect this to happen
(in particular a warn_on in tcp_recvmsg shoots).
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Reported-by: Giorgos Mavrikas <gmavrikas@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1db663983587..2c2b13a999ea 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4529,6 +4529,9 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size) struct tcphdr *th; bool fragstolen; + if (size == 0) + return 0; + skb = alloc_skb(size + sizeof(*th), sk->sk_allocation); if (!skb) goto err; |
