]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
zram: do not leak page on writeback_store error path
authorSergey Senozhatsky <senozhatsky@chromium.org>
Fri, 21 Feb 2025 22:25:47 +0000 (07:25 +0900)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 28 Feb 2025 01:00:25 +0000 (17:00 -0800)
Ensure the page used for local object data is freed on error out path.

Link: https://lkml.kernel.org/r/20250221222958.2225035-17-senozhatsky@chromium.org
Fixes: 330edc2bc059 (zram: rework writeback target selection strategy)
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Yosry Ahmed <yosry.ahmed@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/block/zram/zram_drv.c

index 1da329cae8ce5d3cf1444dd6f35058334b0bfe7a..4e9381b153da252ea9d3b059919aa209b568d55e 100644 (file)
@@ -792,7 +792,7 @@ static ssize_t writeback_store(struct device *dev,
        unsigned long index = 0;
        struct bio bio;
        struct bio_vec bio_vec;
-       struct page *page;
+       struct page *page = NULL;
        ssize_t ret = len;
        int mode, err;
        unsigned long blk_idx = 0;
@@ -934,8 +934,10 @@ next:
 
        if (blk_idx)
                free_block_bdev(zram, blk_idx);
-       __free_page(page);
+
 release_init_lock:
+       if (page)
+               __free_page(page);
        release_pp_ctl(zram, ctl);
        atomic_set(&zram->pp_in_progress, 0);
        up_read(&zram->init_lock);