Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda27ff5 authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller
Browse files

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: default avatarStefan Raspl <raspl@linux.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com&gt;&lt;>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6920d1d

net/smc/af_smc.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -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;

}

}