LKML Archive on
help / color / mirror / Atom feed
* [PATCH] ubi: fastmap: Cancel work upon detach
@ 2018-05-16 20:17 Richard Weinberger
  0 siblings, 0 replies; only message in thread
From: Richard Weinberger @ 2018-05-16 20:17 UTC (permalink / raw)
  To: linux-mtd
  Cc: linux-kernel, Richard Weinberger, stable, Ben Hutchings, Martin Townsend

Ben Hutchings pointed out that 29b7a6fa1ec0 ("ubi: fastmap: Don't flush
fastmap work on detach") does not really fix the problem, it just
reduces the risk to hit the race window where fastmap work races against
free()'ing ubi->volumes[].

The correct approach is making sure that no more fastmap work is in
progress before we free ubi data structures.
So we cancel fastmap work right after the ubi background thread is
By setting ubi->thread_enabled to zero we make sure that no further work
tries to wake the thread.

Fixes: 29b7a6fa1ec0 ("ubi: fastmap: Don't flush fastmap work on detach")
Fixes: 74cdaf24004a ("UBI: Fastmap: Fix memory leaks while closing the WL sub-system")
Cc: Ben Hutchings <>
Cc: Martin Townsend <>

Signed-off-by: Richard Weinberger <>
 drivers/mtd/ubi/build.c | 3 +++
 drivers/mtd/ubi/wl.c    | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 6326a02e4568..0cf3356424cd 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1100,6 +1100,9 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)
 	if (ubi->bgt_thread)
+	cancel_work_sync(&ubi->fm_work);
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 3cc302924899..6bbb968fe9da 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1505,6 +1505,7 @@ int ubi_thread(void *u)
 	dbg_wl("background thread \"%s\" is killed", ubi->bgt_name);
+	ubi->thread_enabled = 0;
 	return 0;
@@ -1514,9 +1515,6 @@ int ubi_thread(void *u)
 static void shutdown_work(struct ubi_device *ubi)
-	flush_work(&ubi->fm_work);
 	while (!list_empty(&ubi->works)) {
 		struct ubi_work *wrk;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2018-05-16 20:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-16 20:17 [PATCH] ubi: fastmap: Cancel work upon detach Richard Weinberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).