Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79f632c7 authored by Benjamin Poirier's avatar Benjamin Poirier Committed by David S. Miller
Browse files

unix/stream: fix peeking with an offset larger than data in queue 



Currently, peeking on a unix stream socket with an offset larger than len of
the data in the sk receive queue returns immediately with bogus data.

This patch fixes this so that the behavior is the same as peeking with no
offset on an empty queue: the caller blocks.

Signed-off-by: default avatarBenjamin Poirier <bpoirier@suse.de>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39cc8613

net/unix/af_unix.c

+12 −13
Original line number Diff line number Diff line
@@ -1859,10 +1859,10 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock, 
}



/*

 *	Sleep until data has arrive. But check for races..

 *	Sleep until more data has arrived. But check for races..

 */



static long unix_stream_data_wait(struct sock *sk, long timeo)

static long unix_stream_data_wait(struct sock *sk, long timeo,

				  struct sk_buff *last)

{

	DEFINE_WAIT(wait);
@@ -1871,7 +1871,7 @@ static long unix_stream_data_wait(struct sock *sk, long timeo) 
	for (;;) {

		prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);



		if (!skb_queue_empty(&sk->sk_receive_queue) ||

		if (skb_peek_tail(&sk->sk_receive_queue) != last ||

		    sk->sk_err ||

		    (sk->sk_shutdown & RCV_SHUTDOWN) ||

		    signal_pending(current) ||
@@ -1890,8 +1890,6 @@ static long unix_stream_data_wait(struct sock *sk, long timeo) 
	return timeo;

}







static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,

			       struct msghdr *msg, size_t size,

			       int flags)
@@ -1936,14 +1934,12 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, 
		goto out;

	}



	skip = sk_peek_offset(sk, flags);



	do {

		int chunk;

		struct sk_buff *skb;

		struct sk_buff *skb, *last;



		unix_state_lock(sk);

		skb = skb_peek(&sk->sk_receive_queue);

		last = skb = skb_peek(&sk->sk_receive_queue);

again:

		if (skb == NULL) {

			unix_sk(sk)->recursion_level = 0;
@@ -1966,7 +1962,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, 
				break;

			mutex_unlock(&u->readlock);



			timeo = unix_stream_data_wait(sk, timeo);

			timeo = unix_stream_data_wait(sk, timeo, last);



			if (signal_pending(current)

			    ||  mutex_lock_interruptible(&u->readlock)) {
@@ -1980,9 +1976,12 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, 
			break;

		}



		if (skip >= skb->len) {

		skip = sk_peek_offset(sk, flags);

		while (skip >= skb->len) {

			skip -= skb->len;

			last = skb;

			skb = skb_peek_next(skb, &sk->sk_receive_queue);

			if (!skb)

				goto again;

		}