staging: erofs: fix to handle error path of erofs_vmap()
PATCH 1/1 staging: erofs: fix to handle error path of erofs_vmap()
erofs_vmap() wrapped vmap() and vm_map_ram() to return virtual continuous memory, but both of them can failed due to a lot of reason, previously, erofs_vmap()'s callers didn't handle them, which can potentially cause NULL pointer access, fix it.
Signed-off-by Gao Xiang <gaoxiang25 at huawei.com>
Signed-off-by Chao Yu <yuchao0 at huawei.com>
--- drivers/staging/erofs/unzip_vle.c | 4 ++++ drivers/staging/erofs/unzip_vle_lz4.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/staging/erofs/unzip_vle.c +4 -0
@@ -1029,6 +1029,10 @@ static int z_erofs_vle_unzip(struct super_block *sb, skip_allocpage: vout =erofs_vmap (pages, nr_pages); +if (!vout) { + err = -ENOMEM ; + goto out; + } err =z_erofs_vle_unzip_vmap (compressed_pages, clusterpages, vout, llen, work->pageofs, overlapped);
drivers/staging/erofs/unzip_vle_lz4.c +5 -2
@@ -136,10 +136,13 @@ int z_erofs_vle_unzip_fast_percpu(struct page **compressed_pages, nr_pages =DIV_ROUND_UP (outlen + pageofs,PAGE_SIZE ); -if (clusterpages ==1 ) +if (clusterpages ==1 ) { vin =kmap_atomic (compressed_pages[0 ]); -else + }else { vin =erofs_vmap (compressed_pages, clusterpages); +if (!vin) +return -ENOMEM ; + }preempt_disable (); vout = erofs_pcpubuf[smp_processor_id ()].data;
Signature · 1 line
2.18.0.rc1
PATCH 1/1 staging: erofs: fix to handle error path of erofs_vmap()
Quoted 7 lines · Chao Yu
erofs_vmap()wrappedvmap()andvm_map_ram()to return virtual continuous memory, but both of them can failed due to a lot of reason, previously, erofs_vmap()'s callers didn't handle them, which can potentially cause NULL pointer access, fix it.Signed-off-by Gao Xiang <gaoxiang25 at huawei.com>Signed-off-by Chao Yu <yuchao0 at huawei.com>
Fixes 3883a79abd02 ("staging: erofs: introduce VLE decompression support")
Fixes 0d40d6e399c1 ("staging: erofs: add a generic z_erofs VLE decompressor")
Cc <stable at vger.kernel.org> # 4.19+
Thanks,
Gao Xiang
Quoted 41 lines
--- drivers/staging/erofs/unzip_vle.c | 4 ++++ drivers/staging/erofs/unzip_vle_lz4.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-)drivers/staging/erofs/unzip_vle.c +4
-0@@ -1029,6 +1029,10 @@ static int z_erofs_vle_unzip(struct super_block *sb, skip_allocpage: vout =erofs_vmap (pages, nr_pages); +if (!vout) { + err = -ENOMEM ; + goto out; + } err =z_erofs_vle_unzip_vmap (compressed_pages, clusterpages, vout, llen, work->pageofs, overlapped);drivers/staging/erofs/unzip_vle_lz4.c +5
-2@@ -136,10 +136,13 @@ int z_erofs_vle_unzip_fast_percpu(struct page **compressed_pages, nr_pages =DIV_ROUND_UP (outlen + pageofs,PAGE_SIZE ); -if (clusterpages ==1 ) +if (clusterpages ==1 ) { vin =kmap_atomic (compressed_pages[0 ]); -else + }else { vin =erofs_vmap (compressed_pages, clusterpages); +if (!vin) +return -ENOMEM ; + }preempt_disable (); vout = erofs_pcpubuf[smp_processor_id ()].data;