Commit c32b624f authored by Paulo Alcantara's avatar Paulo Alcantara Committed by Steve French
Browse files

smb: client: fix potential race in cifs_put_tcon() 



dfs_cache_refresh() delayed worker could race with cifs_put_tcon(), so
make sure to call list_replace_init() on @tcon->dfs_ses_list after
kworker is cancelled or finished.

Fixes: 4f42a8b5 ("smb: client: fix DFS interlink failover")
Signed-off-by: default avatarPaulo Alcantara (Red Hat) <pc@manguebit.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent ddca5023

fs/smb/client/connect.c

+1 −3
Original line number Diff line number Diff line
@@ -2532,9 +2532,6 @@ cifs_put_tcon(struct cifs_tcon *tcon, enum smb3_tcon_ref_trace trace) 


	list_del_init(&tcon->tcon_list);

	tcon->status = TID_EXITING;

#ifdef CONFIG_CIFS_DFS_UPCALL

	list_replace_init(&tcon->dfs_ses_list, &ses_list);

#endif

	spin_unlock(&tcon->tc_lock);

	spin_unlock(&cifs_tcp_ses_lock);
@@ -2542,6 +2539,7 @@ cifs_put_tcon(struct cifs_tcon *tcon, enum smb3_tcon_ref_trace trace) 
	cancel_delayed_work_sync(&tcon->query_interfaces);

#ifdef CONFIG_CIFS_DFS_UPCALL

	cancel_delayed_work_sync(&tcon->dfs_cache_work);

	list_replace_init(&tcon->dfs_ses_list, &ses_list);

#endif



	if (tcon->use_witness) {