openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/smc: prevent races between smc_lgr_terminate() and smc_conn_free() 

To prevent races between smc_lgr_terminate() and smc_conn_free() add an
extra check of the lgr field before accessing it, and cancel a delayed
free_work when a new smc connection is created.
This fixes the problem that free_work cleared the lgr variable but
smc_lgr_terminate() or smc_conn_free() still access it in parallel.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Karsten Graul 2019-01-30 18:51:02 +01:00 committed by David S. Miller
parent ca8dc1334a
commit 77f838ace7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/smc/smc_core.c
View File

@ -128,6 +128,8 @@ static void smc_lgr_unregister_conn(struct smc_connection *conn)
{ {
struct smc_link_group *lgr = conn->lgr; struct smc_link_group *lgr = conn->lgr;
if (!lgr)
return;
write_lock_bh(&lgr->conns_lock); write_lock_bh(&lgr->conns_lock);
if (conn->alert_token_local) { if (conn->alert_token_local) {
__smc_lgr_unregister_conn(conn); __smc_lgr_unregister_conn(conn);
@ -628,6 +630,8 @@ int smc_conn_create(struct smc_sock *smc, bool is_smcd, int srv_first_contact,
local_contact = SMC_REUSE_CONTACT; local_contact = SMC_REUSE_CONTACT;
conn->lgr = lgr; conn->lgr = lgr;
smc_lgr_register_conn(conn); /* add smc conn to lgr */ smc_lgr_register_conn(conn); /* add smc conn to lgr */
if (delayed_work_pending(&lgr->free_work))
cancel_delayed_work(&lgr->free_work);
write_unlock_bh(&lgr->conns_lock); write_unlock_bh(&lgr->conns_lock);
break; break;
} }