summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLuis Chamberlain <mcgrof@kernel.org>2020-06-19 20:47:27 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-19 08:15:59 +0200
commita6619810135b5365d1d4b83791a4e1f1464a0a41 (patch)
tree538399a8f59f7a92dd6933bacc68c745426ed61b /drivers/block
parent0e656b7e85c35b708399de067ee2319702922dd8 (diff)
downloadlinux-a6619810135b5365d1d4b83791a4e1f1464a0a41.tar.gz
linux-a6619810135b5365d1d4b83791a4e1f1464a0a41.tar.bz2
linux-a6619810135b5365d1d4b83791a4e1f1464a0a41.zip
loop: be paranoid on exit and prevent new additions / removals
[ 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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/loop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 565e35e69f24..bddbbf5b3dda 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2325,6 +2325,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);
@@ -2332,6 +2334,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);