* [PATCH v1] erofs: fix possible memory leak in z_erofs_gbuf_exit()
@ 2024-06-24 22:02 Sandeep Dhavale
2024-06-25 1:02 ` Gao Xiang
2024-06-26 8:26 ` Chao Yu
0 siblings, 2 replies; 3+ messages in thread
From: Sandeep Dhavale @ 2024-06-24 22:02 UTC (permalink / raw)
To: linux-erofs, Gao Xiang, Chao Yu, Yue Hu, Jeffle Xu,
Sandeep Dhavale, Chunhai Guo
Cc: hsiangkao, kernel-team, linux-kernel
Because we incorrectly reused of variable `i` in `z_erofs_gbuf_exit()`
for inner loop, we may exit early from outer loop resulting in memory
leak. Fix this by using separate variable for iterating through inner loop.
Fixes: f36f3010f676 ("erofs: rename per-CPU buffers to global buffer pool and make it configurable")
Signed-off-by: Sandeep Dhavale <dhavale@google.com>
---
fs/erofs/zutil.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/erofs/zutil.c b/fs/erofs/zutil.c
index 036024bce9f7..b80f612867c2 100644
--- a/fs/erofs/zutil.c
+++ b/fs/erofs/zutil.c
@@ -148,7 +148,7 @@ int __init z_erofs_gbuf_init(void)
void z_erofs_gbuf_exit(void)
{
- int i;
+ int i, j;
for (i = 0; i < z_erofs_gbuf_count + (!!z_erofs_rsvbuf); ++i) {
struct z_erofs_gbuf *gbuf = &z_erofs_gbufpool[i];
@@ -161,9 +161,9 @@ void z_erofs_gbuf_exit(void)
if (!gbuf->pages)
continue;
- for (i = 0; i < gbuf->nrpages; ++i)
- if (gbuf->pages[i])
- put_page(gbuf->pages[i]);
+ for (j = 0; j < gbuf->nrpages; ++j)
+ if (gbuf->pages[j])
+ put_page(gbuf->pages[j]);
kfree(gbuf->pages);
gbuf->pages = NULL;
}
--
2.45.2.741.gdbec12cfda-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1] erofs: fix possible memory leak in z_erofs_gbuf_exit()
2024-06-24 22:02 [PATCH v1] erofs: fix possible memory leak in z_erofs_gbuf_exit() Sandeep Dhavale
@ 2024-06-25 1:02 ` Gao Xiang
2024-06-26 8:26 ` Chao Yu
1 sibling, 0 replies; 3+ messages in thread
From: Gao Xiang @ 2024-06-25 1:02 UTC (permalink / raw)
To: Sandeep Dhavale, linux-erofs, Gao Xiang, Chao Yu, Yue Hu,
Jeffle Xu, Chunhai Guo
Cc: kernel-team, linux-kernel
On 2024/6/25 06:02, Sandeep Dhavale wrote:
> Because we incorrectly reused of variable `i` in `z_erofs_gbuf_exit()`
> for inner loop, we may exit early from outer loop resulting in memory
> leak. Fix this by using separate variable for iterating through inner loop.
>
> Fixes: f36f3010f676 ("erofs: rename per-CPU buffers to global buffer pool and make it configurable")
>
> Signed-off-by: Sandeep Dhavale <dhavale@google.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
> ---
> fs/erofs/zutil.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/erofs/zutil.c b/fs/erofs/zutil.c
> index 036024bce9f7..b80f612867c2 100644
> --- a/fs/erofs/zutil.c
> +++ b/fs/erofs/zutil.c
> @@ -148,7 +148,7 @@ int __init z_erofs_gbuf_init(void)
>
> void z_erofs_gbuf_exit(void)
> {
> - int i;
> + int i, j;
>
> for (i = 0; i < z_erofs_gbuf_count + (!!z_erofs_rsvbuf); ++i) {
> struct z_erofs_gbuf *gbuf = &z_erofs_gbufpool[i];
> @@ -161,9 +161,9 @@ void z_erofs_gbuf_exit(void)
> if (!gbuf->pages)
> continue;
>
> - for (i = 0; i < gbuf->nrpages; ++i)
> - if (gbuf->pages[i])
> - put_page(gbuf->pages[i]);
> + for (j = 0; j < gbuf->nrpages; ++j)
> + if (gbuf->pages[j])
> + put_page(gbuf->pages[j]);
> kfree(gbuf->pages);
> gbuf->pages = NULL;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v1] erofs: fix possible memory leak in z_erofs_gbuf_exit()
2024-06-24 22:02 [PATCH v1] erofs: fix possible memory leak in z_erofs_gbuf_exit() Sandeep Dhavale
2024-06-25 1:02 ` Gao Xiang
@ 2024-06-26 8:26 ` Chao Yu
1 sibling, 0 replies; 3+ messages in thread
From: Chao Yu @ 2024-06-26 8:26 UTC (permalink / raw)
To: Sandeep Dhavale, linux-erofs, Gao Xiang, Yue Hu, Jeffle Xu,
Chunhai Guo
Cc: hsiangkao, kernel-team, linux-kernel
On 2024/6/25 6:02, Sandeep Dhavale wrote:
> Because we incorrectly reused of variable `i` in `z_erofs_gbuf_exit()`
> for inner loop, we may exit early from outer loop resulting in memory
> leak. Fix this by using separate variable for iterating through inner loop.
>
> Fixes: f36f3010f676 ("erofs: rename per-CPU buffers to global buffer pool and make it configurable")
>
> Signed-off-by: Sandeep Dhavale <dhavale@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Thanks,
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-26 8:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-24 22:02 [PATCH v1] erofs: fix possible memory leak in z_erofs_gbuf_exit() Sandeep Dhavale
2024-06-25 1:02 ` Gao Xiang
2024-06-26 8:26 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox