]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
zram: fix uninitialized ZRAM not releasing backing device
authorKairui Song <kasong@tencent.com>
Mon, 9 Dec 2024 16:57:16 +0000 (00:57 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 19 Dec 2024 03:04:44 +0000 (19:04 -0800)
Setting backing device is done before ZRAM initialization.  If we set the
backing device, then remove the ZRAM module without initializing the
device, the backing device reference will be leaked and the device will be
hold forever.

Fix this by always reset the ZRAM fully on rmmod or reset store.

Link: https://lkml.kernel.org/r/20241209165717.94215-3-ryncsn@gmail.com
Fixes: 013bf95a83ec ("zram: add interface to specif backing device")
Signed-off-by: Kairui Song <kasong@tencent.com>
Reported-by: Desheng Wu <deshengwu@tencent.com>
Suggested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/block/zram/zram_drv.c

index e86cc3d2f4d2db02332c564b13ca4aea32dc7ebf..45df5eeabc5e3df07ad8525a6b33813f0bb49749 100644 (file)
@@ -1444,12 +1444,16 @@ static void zram_meta_free(struct zram *zram, u64 disksize)
        size_t num_pages = disksize >> PAGE_SHIFT;
        size_t index;
 
+       if (!zram->table)
+               return;
+
        /* Free all pages that are still in this zram device */
        for (index = 0; index < num_pages; index++)
                zram_free_page(zram, index);
 
        zs_destroy_pool(zram->mem_pool);
        vfree(zram->table);
+       zram->table = NULL;
 }
 
 static bool zram_meta_alloc(struct zram *zram, u64 disksize)
@@ -2326,11 +2330,6 @@ static void zram_reset_device(struct zram *zram)
 
        zram->limit_pages = 0;
 
-       if (!init_done(zram)) {
-               up_write(&zram->init_lock);
-               return;
-       }
-
        set_capacity_and_notify(zram->disk, 0);
        part_stat_set_all(zram->disk->part0, 0);