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

Commit cb4dc41e authored by Jon Maloy's avatar Jon Maloy Committed by David S. Miller
Browse files

tipc: fix broken tipc_poll() function 



In commit ae236fb2 ("tipc: receive group membership events via
member socket") we broke the tipc_poll() function by checking the
state of the receive queue before the call to poll_sock_wait(), while
relying that state afterwards, when it might have changed.

We restore this in this commit.

Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 471abeab

net/tipc/socket.c

+2 −3
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock, 
			      poll_table *wait)

{

	struct sock *sk = sock->sk;

	struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);

	struct tipc_sock *tsk = tipc_sk(sk);

	struct tipc_group *grp = tsk->group;

	u32 revents = 0;
@@ -733,7 +732,7 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock, 
		/* fall thru' */

	case TIPC_LISTEN:

	case TIPC_CONNECTING:

		if (skb)

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

			revents |= POLLIN | POLLRDNORM;

		break;

	case TIPC_OPEN:
@@ -742,7 +741,7 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock, 
				revents |= POLLOUT;

		if (!tipc_sk_type_connectionless(sk))

			break;

		if (!skb)

		if (skb_queue_empty(&sk->sk_receive_queue))

			break;

		revents |= POLLIN | POLLRDNORM;

		break;