[net-next] net/smc: Ensure correct state of the socket in send path

Commit Message

Karsten Graul June 25, 2021, 3:11 p.m. UTC

From: Guvenc Gulce <[e-mail]>

When smc_sendmsg() is called before the SMC socket initialization has
completed, smc_tx_sendmsg() will access un-initialized fields of the
SMC socket which results in a null-pointer dereference.
Fix this by checking the socket state first in smc_tx_sendmsg().

Fixes: e0e4b8fa5338 ("net/smc: Add SMC statistics support")
Reported-by: [e-mail]
Reviewed-by: Karsten Graul <[e-mail]>
Signed-off-by: Guvenc Gulce <[e-mail]>
Signed-off-by: Karsten Graul <[e-mail]>
---
 net/smc/smc_tx.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

[e-mail] June 25, 2021, 7 p.m. UTC | #1

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Fri, 25 Jun 2021 17:11:02 +0200 you wrote:
> From: Guvenc Gulce <[e-mail]>
> 
> When smc_sendmsg() is called before the SMC socket initialization has
> completed, smc_tx_sendmsg() will access un-initialized fields of the
> SMC socket which results in a null-pointer dereference.
> Fix this by checking the socket state first in smc_tx_sendmsg().
> 
> [...]

Here is the summary with links:
  - [net-next] net/smc: Ensure correct state of the socket in send path
    https://git.kernel.org/netdev/net-next/c/17081633e22d

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Patch

diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
index 075c4f4b41cf..289025cd545a 100644
--- a/net/smc/smc_tx.c
+++ b/net/smc/smc_tx.c
@@ -154,6 +154,9 @@  int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len)
 		goto out_err;
 	}
 
+	if (sk->sk_state == SMC_INIT)
+		return -ENOTCONN;
+
 	if (len > conn->sndbuf_desc->len)
 		SMC_STAT_RMB_TX_SIZE_SMALL(smc, !conn->lnk);
 
@@ -164,8 +167,6 @@  int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len)
 		SMC_STAT_INC(smc, urg_data_cnt);
 
 	while (msg_data_left(msg)) {
-		if (sk->sk_state == SMC_INIT)
-			return -ENOTCONN;
 		if (smc->sk.sk_shutdown & SEND_SHUTDOWN ||
 		    (smc->sk.sk_err == ECONNABORTED) ||
 		    conn->killed)