Skip to content

Commit 0005e01

Browse files
committed
erofs: fix out-of-bound access when z_erofs_gbuf_growsize() partially fails
If z_erofs_gbuf_growsize() partially fails on a global buffer due to memory allocation failure or fault injection (as reported by syzbot [1]), new pages need to be freed by comparing to the existing pages to avoid memory leaks. However, the old gbuf->pages[] array may not be large enough, which can lead to null-ptr-deref or out-of-bound access. Fix this by checking against gbuf->nrpages in advance. [1] https://lore.kernel.org/r/[email protected] Reported-by: [email protected] Fixes: d6db47e ("erofs: do not use pagepool in z_erofs_gbuf_growsize()") Cc: <[email protected]> # 6.10+ Reviewed-by: Chunhai Guo <[email protected]> Reviewed-by: Sandeep Dhavale <[email protected]> Signed-off-by: Gao Xiang <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent e080a26 commit 0005e01

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/erofs/zutil.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ int z_erofs_gbuf_growsize(unsigned int nrpages)
111111
out:
112112
if (i < z_erofs_gbuf_count && tmp_pages) {
113113
for (j = 0; j < nrpages; ++j)
114-
if (tmp_pages[j] && tmp_pages[j] != gbuf->pages[j])
114+
if (tmp_pages[j] && (j >= gbuf->nrpages ||
115+
tmp_pages[j] != gbuf->pages[j]))
115116
__free_page(tmp_pages[j]);
116117
kfree(tmp_pages);
117118
}

0 commit comments

Comments
 (0)