aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>2016-10-08 09:14:37 -0400
committerDavid Teigland <teigland@redhat.com>2016-10-10 10:54:00 -0400
commit3a8db79889ce16930aff19b818f5b09651bb7644 (patch)
treee4395e493ec475bbcb9402e647e9429b56be3db3 /fs/dlm
parentc8d2bc9bc39ebea8437fd974fdbc21847bb897a3 (diff)
dlm: free workqueues after the connections
After backporting commit ee44b4bc054a ("dlm: use sctp 1-to-1 API") series to a kernel with an older workqueue which didn't use RCU yet, it was noticed that we are freeing the workqueues in dlm_lowcomms_stop() too early as free_conn() will try to access that memory for canceling the queued works if any. This issue was introduced by commit 0d737a8cfd83 as before it such attempt to cancel the queued works wasn't performed, so the issue was not present. This patch fixes it by simply inverting the free order. Cc: stable@vger.kernel.org Fixes: 0d737a8cfd83 ("dlm: fix race while closing connections") Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/lowcomms.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 963016c8f3d1..609998de533e 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1656,16 +1656,12 @@ void dlm_lowcomms_stop(void)
1656 mutex_lock(&connections_lock); 1656 mutex_lock(&connections_lock);
1657 dlm_allow_conn = 0; 1657 dlm_allow_conn = 0;
1658 foreach_conn(stop_conn); 1658 foreach_conn(stop_conn);
1659 clean_writequeues();
1660 foreach_conn(free_conn);
1659 mutex_unlock(&connections_lock); 1661 mutex_unlock(&connections_lock);
1660 1662
1661 work_stop(); 1663 work_stop();
1662 1664
1663 mutex_lock(&connections_lock);
1664 clean_writequeues();
1665
1666 foreach_conn(free_conn);
1667
1668 mutex_unlock(&connections_lock);
1669 kmem_cache_destroy(con_cache); 1665 kmem_cache_destroy(con_cache);
1670} 1666}
1671 1667