summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSandeep Dhavale <dhavale@google.com>2024-06-24 15:02:05 -0700
committerGao Xiang <hsiangkao@linux.alibaba.com>2024-06-26 17:02:15 +0800
commit9d01f6f6d8b57131c74810739b9d65141062e4c0 (patch)
tree17b3b7b0e3f4b37f06b7d579f5ca634f9b6e46a2 /fs
parentf2661062f16b2de5d7b6a5c42a9a5c96326b8454 (diff)
downloadlinux-stable-9d01f6f6d8b57131c74810739b9d65141062e4c0.tar.gz
linux-stable-9d01f6f6d8b57131c74810739b9d65141062e4c0.tar.bz2
linux-stable-9d01f6f6d8b57131c74810739b9d65141062e4c0.zip
erofs: fix possible memory leak in z_erofs_gbuf_exit()
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> Reviewed-by: Chao Yu <chao@kernel.org> Link: https://lore.kernel.org/r/20240624220206.3373197-1-dhavale@google.com Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/erofs/zutil.c8
1 files 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;
}