diff options
| author |   Ming Lei <ming.lei@redhat.com> | 2021-10-25 10:54:25 +0800 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-11-02 14:43:12 -0600 |
| commit | 5a4b653655d554b5f51a5d2252882708c56a6f7e (patch) | |
| tree | 1175203370b5c7974bebe1aa55087c12b68363f9 /drivers/block | |
| parent | zram: don't fail to remove zram during unloading module (diff) | |
| download | linux-dev-5a4b653655d554b5f51a5d2252882708c56a6f7e.tar.xz linux-dev-5a4b653655d554b5f51a5d2252882708c56a6f7e.zip | |
zram: avoid race between zram_remove and disksize_store
After resetting device in zram_remove(), disksize_store still may come and
allocate resources again before deleting gendisk, fix the race by resetting
zram after del_gendisk() returns. At that time, disksize_store can't come
any more.
Reported-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Link: https://lore.kernel.org/r/20211025025426.2815424-4-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 13b65ebbab8d..2dfa3a396c7c 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2006,6 +2006,13 @@ static int zram_remove(struct zram *zram) /* del_gendisk drains pending reset_store */ WARN_ON_ONCE(claimed && zram->claim); + /* + * disksize_store() may be called in between zram_reset_device() + * and del_gendisk(), so run the last reset to avoid leaking + * anything allocated with disksize_store() + */ + zram_reset_device(zram); + blk_cleanup_disk(zram->disk); kfree(zram); return 0; |