Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

BACKPORT: tcp: fix recv with flags MSG_WAITALL | MSG_PEEK

Browse source 
Currently, tcp_recvmsg enters a busy loop in sk_wait_data if called
with flags = MSG_WAITALL | MSG_PEEK.

sk_wait_data waits for sk_receive_queue not empty, but in this case,
the receive queue is not empty, but does not contain any skb that we
can use.

Add a "last skb seen on receive queue" argument to sk_wait_data, so
that it sleeps until the receive queue has new skbs.

Change-Id: If58492ae474effe058541f7e9a0c03dc24155393
Link: https://bugzilla.kernel.org/show_bug.cgi?id=99461
Link: https://sourceware.org/bugzilla/show_bug.cgi?id=18493
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1205258
Reported-by: Enrico Scholz <rh-bugzilla@ensc.de>
Reported-by: Dan Searle <dan@censornet.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
This commit is contained in:
Sabrina Dubroca 2015-07-24 18:19:25 +02:00 committed by Matsvei Niaverau
parent 721c4f160d
commit 82794d1071
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/sock.h
View file

@ -791,7 +791,7 @@ void sk_stream_wait_close(struct sock *sk, long timeo_p);
int sk_stream_error(struct sock *sk, int flags, int err); int sk_stream_error(struct sock *sk, int flags, int err);
void sk_stream_kill_queues(struct sock *sk); void sk_stream_kill_queues(struct sock *sk);
int sk_wait_data(struct sock *sk, long *timeo); int sk_wait_data(struct sock *sk, long *timeo, const struct sk_buff *skb);
struct request_sock_ops; struct request_sock_ops;
struct timewait_sock_ops; struct timewait_sock_ops;

5
net/core/sock.c
View file

@ -1739,20 +1739,21 @@ static void __release_sock(struct sock *sk)
* sk_wait_data - wait for data to arrive at sk_receive_queue * sk_wait_data - wait for data to arrive at sk_receive_queue
* @sk: sock to wait on * @sk: sock to wait on
* @timeo: for how long * @timeo: for how long
* @skb: last skb seen on sk_receive_queue
* *
* Now socket state including sk->sk_err is changed only under lock, * Now socket state including sk->sk_err is changed only under lock,
* hence we may omit checks after joining wait queue. * hence we may omit checks after joining wait queue.
* We check receive queue before schedule() only as optimization; * We check receive queue before schedule() only as optimization;
* it is very likely that release_sock() added new data. * it is very likely that release_sock() added new data.
*/ */
int sk_wait_data(struct sock *sk, long *timeo) int sk_wait_data(struct sock *sk, long *timeo, const struct sk_buff *skb)
{ {
int rc; int rc;
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
rc = sk_wait_event(sk, timeo, !skb_queue_empty(&sk->sk_receive_queue)); rc = sk_wait_event(sk, timeo, skb_peek_tail(&sk->sk_receive_queue) != skb);
clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
finish_wait(sk_sleep(sk), &wait); finish_wait(sk_sleep(sk), &wait);
return rc; return rc;

2
net/dccp/proto.c
View file

@ -888,7 +888,7 @@ verify_sock_status:
break; break;
} }
sk_wait_data(sk, &timeo); sk_wait_data(sk, &timeo, NULL);
continue; continue;
found_ok_skb: found_ok_skb:
if (len > skb->len) if (len > skb->len)

11
net/ipv4/tcp.c
View file

@ -677,7 +677,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
*/ */
if (!skb_queue_empty(&sk->sk_receive_queue)) if (!skb_queue_empty(&sk->sk_receive_queue))
break; break;
sk_wait_data(sk, &timeo); sk_wait_data(sk, &timeo, NULL);
if (signal_pending(current)) { if (signal_pending(current)) {
ret = sock_intr_errno(timeo); ret = sock_intr_errno(timeo);
break; break;
@ -1457,7 +1457,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
long timeo; long timeo;
struct task_struct *user_recv = NULL; struct task_struct *user_recv = NULL;
bool copied_early = false; bool copied_early = false;
struct sk_buff *skb; struct sk_buff *skb, *last;
u32 urg_hole = 0; u32 urg_hole = 0;
lock_sock(sk); lock_sock(sk);
@ -1517,7 +1517,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
/* Next get a buffer. */ /* Next get a buffer. */
last = skb_peek_tail(&sk->sk_receive_queue);
skb_queue_walk(&sk->sk_receive_queue, skb) { skb_queue_walk(&sk->sk_receive_queue, skb) {
last = skb;
/* Now that we have two receive queues this /* Now that we have two receive queues this
* shouldn't happen. * shouldn't happen.
*/ */
@ -1646,8 +1648,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
/* Do not sleep, just process backlog. */ /* Do not sleep, just process backlog. */
release_sock(sk); release_sock(sk);
lock_sock(sk); lock_sock(sk);
} else } else {
sk_wait_data(sk, &timeo); sk_wait_data(sk, &timeo, last);
}
#ifdef CONFIG_NET_DMA #ifdef CONFIG_NET_DMA
tcp_service_net_dma(sk, false); /* Don't block */ tcp_service_net_dma(sk, false); /* Don't block */

4
net/llc/af_llc.c
View file

@ -614,7 +614,7 @@ static int llc_wait_data(struct sock *sk, long timeo)
if (signal_pending(current)) if (signal_pending(current))
break; break;
rc = 0; rc = 0;
if (sk_wait_data(sk, &timeo)) if (sk_wait_data(sk, &timeo, NULL))
break; break;
} }
return rc; return rc;
@ -803,7 +803,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
release_sock(sk); release_sock(sk);
lock_sock(sk); lock_sock(sk);
} else } else
sk_wait_data(sk, &timeo); sk_wait_data(sk, &timeo, NULL);
if ((flags & MSG_PEEK) && peek_seq != llc->copied_seq) { if ((flags & MSG_PEEK) && peek_seq != llc->copied_seq) {
if (net_ratelimit()) if (net_ratelimit())