summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorKarsten Graul <kgraul@linux.ibm.com>2018-10-23 13:40:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-04 14:50:51 +0100
commitfd54c188b3391acc9a9bba329b10d4965e0ab812 (patch)
tree454d9ef9cb4d545fa99ff1162542ee905d49f624 /crypto
parent4fb0dc97de1cd79399ab0c556f096d8db2bac278 (diff)
downloadlinux-stable-fd54c188b3391acc9a9bba329b10d4965e0ab812.tar.gz
linux-stable-fd54c188b3391acc9a9bba329b10d4965e0ab812.tar.bz2
linux-stable-fd54c188b3391acc9a9bba329b10d4965e0ab812.zip
Revert "net: simplify sock_poll_wait"
[ Upstream commit 89ab066d4229acd32e323f1569833302544a4186 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/af_alg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index b053179e0bc5..17eb09d222ff 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)