瀏覽代碼

smc: fix sendpage() call

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>
Stefan Raspl 7 年之前
父節點
當前提交
bda27ff5c4
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      net/smc/af_smc.c

+ 4 - 2
net/smc/af_smc.c

@@ -1315,8 +1315,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);
@@ -1324,7 +1327,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;
 }
 }