Commit 0d6a775e authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

tcp: in sendmsg/pages open code the real goto target 



copied was assigned zero right before the goto, so if (copied)
cannot ever be true.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cabeccbd

net/ipv4/tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffse 


	err = -EPIPE;

	if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))

		goto do_error;

		goto out_err;



	while (psize > 0) {

		struct sk_buff *skb = tcp_write_queue_tail(sk);
@@ -854,7 +854,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 


	err = -EPIPE;

	if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))

		goto do_error;

		goto out_err;



	while (--iovlen >= 0) {

		int seglen = iov->iov_len;