Commit 8c693742 authored by Gao Xiang's avatar Gao Xiang Committed by Sandeep Dhavale
Browse files

UPSTREAM: 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/000000000000f7b96e062018c6e3@google.com



Bug: 361155705
Reported-by: default avatar <syzbot+242ee56aaa9585553766@syzkaller.appspotmail.com>
Fixes: d6db47e5 ("erofs: do not use pagepool in z_erofs_gbuf_growsize()")
Cc: <stable@vger.kernel.org> # 6.10+
Reviewed-by: default avatarChunhai Guo <guochunhai@vivo.com>
Reviewed-by: default avatarSandeep Dhavale <dhavale@google.com>
Change-Id: Idf37327623c70b305bf78b0b8ef2113df2514c99
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240820085619.1375963-1-hsiangkao@linux.alibaba.com


(cherry picked from commit 0005e01e)
Signed-off-by: default avatarSandeep Dhavale <dhavale@google.com>
parent f7078dd6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment