diff options
| author | Stefan Raspl <stefan.raspl@linux.ibm.com> | 2018-05-03 17:57:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-21 04:01:34 +0900 |
| commit | 1a767e7368d277c10e673844dfa69713e66b9b8c (patch) | |
| tree | 6ca3d638097c901b2ec7c33b7a8d4f464fe094cb /net | |
| parent | 3859ef2e35925ebf0a01e3badba0db4f08620acb (diff) | |
smc: fix sendpage() call
[ Upstream commit bda27ff5c4526f80a7620a94ecfe8dca153e3696 ]
The sendpage() call grabs the sock lock before calling the default
implementation - which tries to grab it once again.
Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com><
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/smc/af_smc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 5a983c9bea53..0132c08b0680 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1313,8 +1313,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page, smc = smc_sk(sk); lock_sock(sk); - if (sk->sk_state != SMC_ACTIVE) + if (sk->sk_state != SMC_ACTIVE) { + release_sock(sk); goto out; + } + release_sock(sk); if (smc->use_fallback) rc = kernel_sendpage(smc->clcsock, page, offset, size, flags); @@ -1322,7 +1325,6 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page, rc = sock_no_sendpage(sock, page, offset, size, flags); out: - release_sock(sk); return rc; } |