net/smc: fix refcounting for non-blocking connect()
PATCH 1/1 net/smc: fix refcounting for non-blocking connect()
If a nonblocking socket is immediately closed after connect(), the connect worker may not have started. This results in a refcount problem, since sock_hold() is called from the connect worker. This patch moves the sock_hold in front of the connect worker scheduling.
Reported-by [email protected]
Fixes 50717a37db03 ("net/smc: nonblocking connect rework")
Reviewed-by Karsten Graul <[email protected]>
Signed-off-by Ursula Braun <[email protected]>
--- net/smc/af_smc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/smc/af_smc.c +2 -2
@@ -707,8 +707,6 @@ static int __smc_connect(struct smc_sock *smc)int smc_type;int rc =0 ; -sock_hold (&smc->sk);/* sock put in passive closing */ -if (smc->use_fallback)return smc_connect_fallback (smc, smc->fallback_rsn);
@@ -853,6 +851,8 @@ static int smc_connect(struct socket *sock, struct sockaddr *addr, rc =kernel_connect (smc->clcsock, addr, alen, flags);if (rc && rc != -EINPROGRESS ) goto out; + +sock_hold (&smc->sk);/* sock put in passive closing */ if (flags &O_NONBLOCK ) {if (schedule_work (&smc->connect_work)) smc->connect_nonblock =1 ;
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Ursula Braun <[email protected]>
Date: Tue, 29 Oct 2019 12:41:26 +0100
Quoted 10 lines
If a nonblocking socket is immediately closed after
connect(), the connect worker may not have started. This results in a refcount problem, sincesock_hold()is called from the connect worker. This patch moves thesock_holdin front of the connect worker scheduling.Reported-by [email protected]Fixes 50717a37db03 ("net/smc: nonblocking connect rework")Reviewed-by Karsten Graul <[email protected]>Signed-off-by Ursula Braun <[email protected]>
Applied and queued up for -stable, thank you.