diff options
| author | Gao Xiang <gaoxiang25@huawei.com> | 2019-10-09 18:05:52 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-11 18:36:56 +0200 |
| commit | 5bb124e1d18e984901039bec4ff94dd40dea8858 (patch) | |
| tree | 9018c938b1289ebd8525b3959b24b18ca14f7043 | |
| parent | f59a603cd9f614c7aaa49178fb875a925b39c1fb (diff) | |
| download | linux-stable-5bb124e1d18e984901039bec4ff94dd40dea8858.tar.gz linux-stable-5bb124e1d18e984901039bec4ff94dd40dea8858.tar.bz2 linux-stable-5bb124e1d18e984901039bec4ff94dd40dea8858.zip | |
staging: erofs: add two missing erofs_workgroup_put for corrupted images
commit 138e1a0990e80db486ab9f6c06bd5c01f9a97999 upstream.
As reported by erofs-utils fuzzer, these error handling
path will be entered to handle corrupted images.
Lack of erofs_workgroup_puts will cause unmounting
unsuccessfully.
Fix these return values to EFSCORRUPTED as well.
Fixes: 3883a79abd02 ("staging: erofs: introduce VLE decompression support")
Cc: <stable@vger.kernel.org> # 4.19+
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20190819103426.87579-4-gaoxiang25@huawei.com
[ Gao Xiang: Older kernel versions don't have length validity check
and EFSCORRUPTED, thus backport pageofs check for now. ]
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/erofs/unzip_vle.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c index 438d78db69cf..5069cc4c9fb8 100644 --- a/drivers/staging/erofs/unzip_vle.c +++ b/drivers/staging/erofs/unzip_vle.c @@ -393,7 +393,11 @@ z_erofs_vle_work_lookup(const struct z_erofs_vle_work_finder *f) /* if multiref is disabled, `primary' is always true */ primary = true; - DBG_BUGON(work->pageofs != f->pageofs); + if (work->pageofs != f->pageofs) { + DBG_BUGON(1); + erofs_workgroup_put(egrp); + return ERR_PTR(-EIO); + } /* * lock must be taken first to avoid grp->next == NIL between |