]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
zram: do not leak page on recompress_store error path
authorSergey Senozhatsky <senozhatsky@chromium.org>
Fri, 21 Feb 2025 22:25:46 +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-16-senozhatsky@chromium.org
Fixes: 3f909a60cec1 ("zram: rework recompress 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 1ce981ce6f48ddf0f431c0b547b5568b998a00bd..1da329cae8ce5d3cf1444dd6f35058334b0bfe7a 100644 (file)
@@ -2022,7 +2022,7 @@ static ssize_t recompress_store(struct device *dev,
        struct zram_pp_slot *pps;
        u32 mode = 0, threshold = 0;
        u32 prio, prio_max;
-       struct page *page;
+       struct page *page = NULL;
        ssize_t ret;
 
        prio = ZRAM_SECONDARY_COMP;
@@ -2166,9 +2166,9 @@ next:
                cond_resched();
        }
 
-       __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);