diff options
| author |   Karsten Graul <kgraul@linux.ibm.com> | 2018-10-23 13:40:39 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-10-23 10:57:06 -0700 |
| commit | 89ab066d4229acd32e323f1569833302544a4186 (patch) | |
| tree | 8ac41f577d2c524fe0254a23b91144c624c34af4 /net/ipv4/tcp.c | |
| parent | Merge branch 'netsec-fixes' (diff) | |
| download | linux-dev-89ab066d4229acd32e323f1569833302544a4186.tar.xz linux-dev-89ab066d4229acd32e323f1569833302544a4186.zip | |
Revert "net: simplify sock_poll_wait"
This reverts commit dd979b4df817e9976f18fb6f9d134d6bc4a3c317.
This broke tcp_poll for SMC fallback: An AF_SMC socket establishes an
internal TCP socket for the initial handshake with the remote peer.
Whenever the SMC connection can not be established this TCP socket is
used as a fallback. All socket operations on the SMC socket are then
forwarded to the TCP socket. In case of poll, the file->private_data
pointer references the SMC socket because the TCP socket has no file
assigned. This causes tcp_poll to wait on the wrong socket.
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b8ba8fa34eff..1834818ed07b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -507,7 +507,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait) const struct tcp_sock *tp = tcp_sk(sk); int state; - sock_poll_wait(file, wait); + sock_poll_wait(file, sock, wait); state = inet_sk_state_load(sk); if (state == TCP_LISTEN) |