erofs: fix kvcalloc() misuse with __GFP_NOFAIL
PATCH 1/1 erofs: fix kvcalloc() misuse with __GFP_NOFAIL
As reported by syzbot [1], kvcalloc() cannot work with __GFP_NOFAIL. Let's use kcalloc() instead.
[1] https://lore.kernel.org/r/[email protected]
--- fs/erofs/zdata.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/erofs/zdata.c +4 -4
@@ -1032,12 +1032,12 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,if (!be->decompressed_pages) be->decompressed_pages = -kvcalloc (be->nr_pages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (be->nr_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);if (!be->compressed_pages) be->compressed_pages = -kvcalloc (pclusterpages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (pclusterpages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);z_erofs_parse_out_bvecs (be); err2 =z_erofs_parse_in_bvecs (be, &overlapped);
Signature · 1 line
2.24.4
Quoted 5 lines · Gao Xiang
As reported by syzbot [1],
kvcalloc()cannot work with__GFP_NOFAIL. Let's usekcalloc()instead.[1] https://lore.kernel.org/r/[email protected]
Reported-by [email protected]
Quoted 26 lines
Signed-off-by Gao Xiang <[email protected]>--- fs/erofs/zdata.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)fs/erofs/zdata.c +4
-4@@ -1032,12 +1032,12 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,if (!be->decompressed_pages) be->decompressed_pages = -kvcalloc (be->nr_pages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (be->nr_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);if (!be->compressed_pages) be->compressed_pages = -kvcalloc (pclusterpages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (pclusterpages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);z_erofs_parse_out_bvecs (be); err2 =z_erofs_parse_in_bvecs (be, &overlapped);
Quoted 26 lines · Gao Xiang
Quoted 5 lines · Gao Xiang
As reported by syzbot [1],
kvcalloc()cannot work with__GFP_NOFAIL. Let's usekcalloc()instead.[1] https://lore.kernel.org/r/[email protected]
Reported-by [email protected]Fixes fe3e5914e6dc ("erofs: try to leave (de)compressed_pages on stack if possible")Fixes 4f05687fd703 ("erofs: introduce struct z_erofs_decompress_backend")Quoted 14 lines
Signed-off-by Gao Xiang <[email protected]>---
fs/erofs/zdata.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)fs/erofs/zdata.c +0
-0@@ -1032,12 +1032,12 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, if (!be->decompressed_pages)
be->decompressed_pages=
-kvcalloc(be->nr_pages, sizeof(struct page *), - GFP_KERNEL | __GFP_NOFAIL);
Quoted 8 lines
Quoted 8 lines
+
kcalloc(be->nr_pages, sizeof(struct page *), + GFP_KERNEL | __GFP_NOFAIL);
if (!be->compressed_pages)be->compressed_pages=
-kvcalloc(pclusterpages, sizeof(struct page *), - GFP_KERNEL | __GFP_NOFAIL);
+kcalloc(pclusterpages, sizeof(struct page *), + GFP_KERNEL | __GFP_NOFAIL);
How about using kfree instead of kvfree for .decompressed_pages and .compressed_pages memory release? It's trivial though.
Anyway, feel free to add:
Thanks,
Quoted 2 lines
Quoted 2 lines
z_erofs_parse_out_bvecs(be);
err2 =z_erofs_parse_in_bvecs(be, &overlapped);
Hi Chao,
Quoted 30 lines · Chao Yu
Quoted 29 lines · Gao Xiang
Quoted 5 lines · Gao Xiang
As reported by syzbot [1],
kvcalloc()cannot work with__GFP_NOFAIL. Let's usekcalloc()instead.[1] https://lore.kernel.org/r/[email protected]
Reported-by [email protected]Fixes fe3e5914e6dc ("erofs: try to leave (de)compressed_pages on stack if possible")Fixes 4f05687fd703 ("erofs: introduce struct z_erofs_decompress_backend")Quoted 17 lines
Signed-off-by Gao Xiang <[email protected]>---
fs/erofs/zdata.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)fs/erofs/zdata.c +0
-0@@ -1032,12 +1032,12 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, if (!be->decompressed_pages)
be->decompressed_pages=
-kvcalloc(be->nr_pages, sizeof(struct page *), - GFP_KERNEL | __GFP_NOFAIL);
+kcalloc(be->nr_pages, sizeof(struct page *), + GFP_KERNEL | __GFP_NOFAIL);
if (!be->compressed_pages)
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
be->compressed_pages=
-kvcalloc(pclusterpages, sizeof(struct page *), - GFP_KERNEL | __GFP_NOFAIL);
+kcalloc(pclusterpages, sizeof(struct page *), + GFP_KERNEL | __GFP_NOFAIL);How about using kfree instead of kvfree for .decompressed_pages and .compressed_pages memory release? It's trivial though.
Yeah, thanks for catching! I will send v2 to fix these.
Thanks,
Gao Xiang
Quoted 9 lines
Anyway, feel free to add:
Reviewed-by Chao Yu <[email protected]>Thanks,
Quoted 2 lines
Quoted 2 lines
z_erofs_parse_out_bvecs(be);
err2 =z_erofs_parse_in_bvecs(be, &overlapped);
PATCH v2 1/1 erofs: fix kvcalloc() misuse with __GFP_NOFAIL
In reply to Gao XiangAs reported by syzbot [1], kvcalloc() cannot work with __GFP_NOFAIL. Let's use kcalloc() instead.
[1] https://lore.kernel.org/r/[email protected]
---
changes since v1:
- should use kfree() instead of kvfree() as well (Chao);
- add Chao's r-v-b.
fs/erofs/zdata.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/erofs/zdata.c +6 -6
@@ -1032,12 +1032,12 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,if (!be->decompressed_pages) be->decompressed_pages = -kvcalloc (be->nr_pages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (be->nr_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);if (!be->compressed_pages) be->compressed_pages = -kvcalloc (pclusterpages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (pclusterpages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);z_erofs_parse_out_bvecs (be); err2 =z_erofs_parse_in_bvecs (be, &overlapped);
@@ -1085,7 +1085,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, }if (be->compressed_pages < be->onstack_pages || be->compressed_pages >= be->onstack_pages +Z_EROFS_ONSTACK_PAGES ) -kvfree (be->compressed_pages); +kfree (be->compressed_pages);z_erofs_fill_other_copies (be, err);for (i =0 ; i < be->nr_pages; ++i) {
@@ -1104,7 +1104,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, }if (be->decompressed_pages != be->onstack_pages) -kvfree (be->decompressed_pages); +kfree (be->decompressed_pages); pcl->length =0 ; pcl->partial = true;
Signature · 1 line
2.24.4