From: Youngjun Park <youngjun.park@lge.com>
To: akpm@linux-foundation.org
Cc: linux-mm@kvack.org, shikemeng@huaweicloud.com,
kasong@tencent.com, nphamcs@gmail.com, bhe@redhat.com,
baohua@kernel.org, chrisl@kernel.org, youngjun.park@lge.com,
gunho.lee@lge.com
Subject: [PATCH 1/5] mm, swap: Fix memory leak in setup_clusters() error path
Date: Wed, 29 Oct 2025 17:56:55 +0900 [thread overview]
Message-ID: <20251029085659.2005942-2-youngjun.park@lge.com> (raw)
In-Reply-To: <20251029085659.2005942-1-youngjun.park@lge.com>
Some error path neglects to free the allocated 'cluster_info',
causing a memory leak.
Change the error jumps to the 'err_free' label to ensure proper
cleanup.
Fixes: 07adc4cf1ecd ("mm, swap: implement dynamic allocation of swap table")
Signed-off-by: Youngjun Park <youngjun.park@lge.com>
---
mm/swapfile.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index c35bb8593f50..6dc0e7a738bc 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3339,7 +3339,7 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si,
*/
err = swap_cluster_setup_bad_slot(cluster_info, 0);
if (err)
- goto err;
+ goto err_free;
for (i = 0; i < swap_header->info.nr_badpages; i++) {
unsigned int page_nr = swap_header->info.badpages[i];
@@ -3347,12 +3347,12 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si,
continue;
err = swap_cluster_setup_bad_slot(cluster_info, page_nr);
if (err)
- goto err;
+ goto err_free;
}
for (i = maxpages; i < round_up(maxpages, SWAPFILE_CLUSTER); i++) {
err = swap_cluster_setup_bad_slot(cluster_info, i);
if (err)
- goto err;
+ goto err_free;
}
INIT_LIST_HEAD(&si->free_clusters);
--
2.34.1
next prev parent reply other threads:[~2025-10-29 8:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-29 8:56 [PATCH 0/5] mm: swap: small fixes and comment cleanups Youngjun Park
2025-10-29 8:56 ` Youngjun Park [this message]
2025-10-29 15:41 ` [PATCH 1/5] mm, swap: Fix memory leak in setup_clusters() error path Kairui Song
2025-10-30 14:32 ` YoungJun Park
2025-10-29 8:56 ` [PATCH 2/5] mm, swap: Use SWP_SOLIDSTATE to determine if swap is rotational Youngjun Park
2025-10-29 16:09 ` Kairui Song
2025-10-30 14:35 ` YoungJun Park
2025-10-29 8:56 ` [PATCH 3/5] mm, swap: Remove redundant comment for read_swap_cache_async Youngjun Park
2025-10-29 8:56 ` [PATCH 4/5] mm: swap: change swap_alloc_slow() to void Youngjun Park
2025-10-29 16:13 ` Kairui Song
2025-10-30 14:39 ` YoungJun Park
2025-10-29 8:56 ` [PATCH 5/5] mm: swap: remove scan_swap_map_slots() references from comments Youngjun Park
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=20251029085659.2005942-2-youngjun.park@lge.com \
--to=youngjun.park@lge.com \
--cc=akpm@linux-foundation.org \
--cc=baohua@kernel.org \
--cc=bhe@redhat.com \
--cc=chrisl@kernel.org \
--cc=gunho.lee@lge.com \
--cc=kasong@tencent.com \
--cc=linux-mm@kvack.org \
--cc=nphamcs@gmail.com \
--cc=shikemeng@huaweicloud.com \
/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