3.5.7.2 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Pavel Emelyanov <[email protected]> commit c454e6111d1ef4268fe98e87087216e51c2718c3 upstream. 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 <[email protected]> Reported-by: Giorgos Mavrikas <[email protected]> Signed-off-by: David S. Miller <[email protected]> [ herton: unfuzz patch for 3.5, place size check before tcp_try_rmem_schedule ] Signed-off-by: Herton Ronaldo Krzesinski <[email protected]> --- net/ipv4/tcp_input.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index ab30c96..4a3cac8 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4713,6 +4713,9 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size) struct tcphdr *th; bool fragstolen; + if (size == 0) + return 0; + if (tcp_try_rmem_schedule(sk, size + sizeof(*th))) goto err; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
