]> git.baikalelectronics.ru Git - kernel.git/commitdiff
dlm: free workqueues after the connections
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Sat, 8 Oct 2016 13:14:37 +0000 (10:14 -0300)
committerDavid Teigland <teigland@redhat.com>
Mon, 10 Oct 2016 14:54:00 +0000 (09:54 -0500)
After backporting commit a7af23a47fe7 ("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 7a8e1bd34a55 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: 7a8e1bd34a55 ("dlm: fix race while closing connections")
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David Teigland <teigland@redhat.com>
fs/dlm/lowcomms.c

index 963016c8f3d12def89c9803eb9d124caa2385dc4..609998de533e894d9cb98f3ff7ef3e05b41d424a 100644 (file)
@@ -1656,16 +1656,12 @@ void dlm_lowcomms_stop(void)
        mutex_lock(&connections_lock);
        dlm_allow_conn = 0;
        foreach_conn(stop_conn);
+       clean_writequeues();
+       foreach_conn(free_conn);
        mutex_unlock(&connections_lock);
 
        work_stop();
 
-       mutex_lock(&connections_lock);
-       clean_writequeues();
-
-       foreach_conn(free_conn);
-
-       mutex_unlock(&connections_lock);
        kmem_cache_destroy(con_cache);
 }