net/smc: fix 2020-09-15
cover net/smc: fix 2020-09-15
Please apply the following patch for smc to netdev's net-next tree.
The patch fixes a problem that was revealed by a smatch warning. Because the fixed patch is still only in net-next tree I am sending this fix to net-next.
Karsten Graul (1):
net/smc: check variable before dereferencing in smc_close.c
net/smc/smc_close.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/1 net/smc: check variable before dereferencing in smc_close.c
smc->clcsock and smc->clcsock->sk are used before the check if they can be dereferenced. Fix this by checking the variables first.
--- net/smc/smc_close.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/smc/smc_close.c +4 -3
@@ -208,11 +208,12 @@ int smc_close_active(struct smc_sock *smc)break ;case SMC_LISTEN : sk->sk_state =SMC_CLOSED ; - smc->clcsock->sk->sk_data_ready = smc->clcsk_data_ready; - smc->clcsock->sk->sk_user_data =NULL ; sk->sk_state_change (sk);/* wake up accept */ -if (smc->clcsock && smc->clcsock->sk) +if (smc->clcsock && smc->clcsock->sk) { + smc->clcsock->sk->sk_data_ready = smc->clcsk_data_ready; + smc->clcsock->sk->sk_user_data =NULL ; rc =kernel_sock_shutdown (smc->clcsock,SHUT_RDWR ); + }smc_close_cleanup_listen (sk);release_sock (sk);flush_work (&smc->tcp_listen_work);
Signature · 1 line
2.17.1
Re: [PATCH net-next 1/1] net/smc: check variable before dereferencing in smc_close.c
From: Karsten Graul <[email protected]>
Date: Tue, 15 Sep 2020 22:57:09 +0200
Quoted 7 lines
smc->clcsockandsmc->clcsock->skare used before the check if they can be dereferenced. Fix this by checking the variables first.Fixes a60a2b1e0af1 ("net/smc: reduce active tcp_listen workers")Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Signed-off-by Karsten Graul <[email protected]>
Applied, thank you.