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 | e6c72b59ed57c5b3ba2f8ce2bc0547c4ff0796ea (patch) | |
| tree | d8024b483ee420f70f3e76de6010f60d96d76d97 | |
| parent | 50d4fb1dc129955ab571c1dd7bf14cd07cc5984d (diff) | |
| download | linux-crypto-e6c72b59ed57c5b3ba2f8ce2bc0547c4ff0796ea.tar.gz linux-crypto-e6c72b59ed57c5b3ba2f8ce2bc0547c4ff0796ea.zip | |
Revert "net: simplify sock_poll_wait"
This reverts commit 68572be439121cad11722a67001872f38c2bbc85.
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>
| -rw-r--r-- | crypto/af_alg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index b053179e..17eb09d2 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -1071,7 +1071,7 @@ __poll_t af_alg_poll(struct file *file, struct socket *sock, struct af_alg_ctx *ctx = ask->private; __poll_t mask; - sock_poll_wait(file, wait); + sock_poll_wait(file, sock, wait); mask = 0; if (!ctx->more || ctx->used) |