From: Sergey Senozhatsky <senozhatsky@chromium.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Yosry Ahmed <yosry.ahmed@linux.dev>,
Hillf Danton <hdanton@sina.com>, Kairui Song <ryncsn@gmail.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Minchan Kim <minchan@kernel.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Sergey Senozhatsky <senozhatsky@chromium.org>
Subject: [PATCH v8 15/17] zram: do not leak page on recompress_store error path
Date: Sat, 22 Feb 2025 07:25:46 +0900 [thread overview]
Message-ID: <20250221222958.2225035-16-senozhatsky@chromium.org> (raw)
In-Reply-To: <20250221222958.2225035-1-senozhatsky@chromium.org>
Ensure the page used for local object data is freed
on error out path.
Fixes: 3f909a60cec1 ("zram: rework recompress target selection strategy")
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
drivers/block/zram/zram_drv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 1ce981ce6f48..1da329cae8ce 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -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 @@ static ssize_t recompress_store(struct device *dev,
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);
--
2.48.1.601.g30ceb7b040-goog
next prev parent reply other threads:[~2025-02-21 22:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-21 22:25 [PATCH v8 00/17] zsmalloc/zram: there be preemption Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 01/17] zram: sleepable entry locking Sergey Senozhatsky
2025-02-24 8:19 ` Sebastian Andrzej Siewior
2025-02-25 4:51 ` Sergey Senozhatsky
2025-02-27 12:05 ` Sebastian Andrzej Siewior
2025-02-27 12:42 ` Sergey Senozhatsky
2025-02-27 13:04 ` Sergey Senozhatsky
2025-02-27 13:12 ` Sebastian Andrzej Siewior
2025-02-27 13:20 ` Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 02/17] zram: permit preemption with active compression stream Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 03/17] zram: remove unused crypto include Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 04/17] zram: remove max_comp_streams device attr Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 05/17] zram: remove second stage of handle allocation Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 06/17] zram: remove writestall zram_stats member Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 07/17] zram: limit max recompress prio to num_active_comps Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 08/17] zram: filter out recomp targets based on priority Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 09/17] zram: rework recompression loop Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 10/17] zsmalloc: rename pool lock Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 11/17] zsmalloc: make zspage lock preemptible Sergey Senozhatsky
2025-02-24 8:59 ` Sebastian Andrzej Siewior
2025-02-25 4:28 ` Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 12/17] zsmalloc: introduce new object mapping API Sergey Senozhatsky
2025-02-24 9:01 ` Sebastian Andrzej Siewior
2025-02-25 4:29 ` Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 13/17] zram: switch to new zsmalloc " Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 14/17] zram: permit reclaim in zstd custom allocator Sergey Senozhatsky
2025-02-24 9:10 ` Sebastian Andrzej Siewior
2025-02-25 4:42 ` Sergey Senozhatsky
2025-02-26 3:01 ` Sergey Senozhatsky
2025-02-27 13:19 ` Sebastian Andrzej Siewior
2025-02-21 22:25 ` Sergey Senozhatsky [this message]
2025-02-21 22:25 ` [PATCH v8 16/17] zram: do not leak page on writeback_store error path Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 17/17] zram: add might_sleep to zcomp API Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250221222958.2225035-16-senozhatsky@chromium.org \
--to=senozhatsky@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=bigeasy@linutronix.de \
--cc=hdanton@sina.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=ryncsn@gmail.com \
--cc=yosry.ahmed@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox