net/smc: do not schedule tx_work in SMC_CLOSED state
PATCH 1/1 net/smc: do not schedule tx_work in SMC_CLOSED state
From: Ursula Braun <[email protected]>
The setsockopts options TCP_NODELAY and TCP_CORK may schedule the tx worker. Make sure the socket is not yet moved into SMC_CLOSED state (for instance by a shutdown SHUT_RDWR call).
Reported-by [email protected]
Reported-by [email protected]
Fixes 01d2f7e2cdd31 ("net/smc: sockopts TCP_NODELAY and TCP_CORK")
Signed-off-by Ursula Braun <[email protected]>
Signed-off-by Karsten Graul <[email protected]>
--- net/smc/af_smc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/smc/af_smc.c +6 -2
@@ -1732,14 +1732,18 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, }break ;case TCP_NODELAY : -if (sk->sk_state !=SMC_INIT && sk->sk_state !=SMC_LISTEN ) { +if (sk->sk_state !=SMC_INIT && + sk->sk_state !=SMC_LISTEN && + sk->sk_state !=SMC_CLOSED ) {if (val && !smc->use_fallback)mod_delayed_work (system_wq, &smc->conn.tx_work,0 ); }break ;case TCP_CORK : -if (sk->sk_state !=SMC_INIT && sk->sk_state !=SMC_LISTEN ) { +if (sk->sk_state !=SMC_INIT && + sk->sk_state !=SMC_LISTEN && + sk->sk_state !=SMC_CLOSED ) {if (!val && !smc->use_fallback)mod_delayed_work (system_wq, &smc->conn.tx_work,0 );
Signature · 1 line
2.21.0
David Miller
maintainerFrom: Karsten Graul <[email protected]>
Date: Fri, 2 Aug 2019 10:16:38 +0200
Quoted 11 lines
From: Ursula Braun <[email protected]>
The setsockopts options
TCP_NODELAYandTCP_CORKmay schedule the tx worker. Make sure the socket is not yet moved intoSMC_CLOSEDstate (for instance by a shutdownSHUT_RDWRcall).Reported-by [email protected]Reported-by [email protected]Fixes 01d2f7e2cdd31 ("net/smc: sockopts TCP_NODELAY and TCP_CORK")Signed-off-by Ursula Braun <[email protected]>Signed-off-by Karsten Graul <[email protected]>
Applied and queued up for -stable.