[PATCH 4.19 028/168] loop: be paranoid on exit and prevent new additions / removals

Greg Kroah-Hartman
2020-08-17T17:52:05Z

From: Luis Chamberlain <mcgrof@kernel.org>

[ Upstream commit 200f93377220504c5e56754823e7adfea6037f1a ]

Be pedantic on removal as well and hold the mutex.
This should prevent uses of addition while we exit.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/block/loop.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 728681a20b7f4..da68c42aed682 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2279,6 +2279,8 @@ static void __exit loop_exit(void)

range = max_loop ? max_loop << part_shift : 1UL << MINORBITS;

+ mutex_lock(&loop_ctl_mutex);
+
idr_for_each(&loop_index_idr, &loop_exit_cb, NULL);
idr_destroy(&loop_index_idr);

@@ -2286,6 +2288,8 @@ static void __exit loop_exit(void)
unregister_blkdev(LOOP_MAJOR, "loop");

misc_deregister(&loop_misc);
+
+ mutex_unlock(&loop_ctl_mutex);
}

module_init(loop_init);
--
2.25.1