Commit 194feed0 authored by Stefan Raspl's avatar Stefan Raspl Committed by Greg Kroah-Hartman

smc: fix sendpage() call

[ Upstream commit bda27ff5 ]

The sendpage() call grabs the sock lock before calling the default
implementation - which tries to grab it once again.
Signed-off-by: default avatarStefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com><
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c0f528f
...@@ -1264,8 +1264,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page, ...@@ -1264,8 +1264,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page,
smc = smc_sk(sk); smc = smc_sk(sk);
lock_sock(sk); lock_sock(sk);
if (sk->sk_state != SMC_ACTIVE) if (sk->sk_state != SMC_ACTIVE) {
release_sock(sk);
goto out; goto out;
}
release_sock(sk);
if (smc->use_fallback) if (smc->use_fallback)
rc = kernel_sendpage(smc->clcsock, page, offset, rc = kernel_sendpage(smc->clcsock, page, offset,
size, flags); size, flags);
...@@ -1273,7 +1276,6 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page, ...@@ -1273,7 +1276,6 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page,
rc = sock_no_sendpage(sock, page, offset, size, flags); rc = sock_no_sendpage(sock, page, offset, size, flags);
out: out:
release_sock(sk);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment