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

Commit 1586a587 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

af_unix: do not report POLLOUT on listeners



poll(POLLOUT) on a listener should not report fd is ready for
a write().

This would break some applications using poll() and pfd.events = -1,
as they would not block in poll()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarAlan Burlison <Alan.Burlison@oracle.com>
Tested-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 742e0383
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -326,9 +326,10 @@ static struct sock *unix_find_socket_byinode(struct inode *i)
	return s;
}

static inline int unix_writable(struct sock *sk)
static int unix_writable(const struct sock *sk)
{
	return (atomic_read(&sk->sk_wmem_alloc) << 2) <= sk->sk_sndbuf;
	return sk->sk_state != TCP_LISTEN &&
	       (atomic_read(&sk->sk_wmem_alloc) << 2) <= sk->sk_sndbuf;
}

static void unix_write_space(struct sock *sk)