From: Gao Xiang <gaoxiang25@huawei.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<stable@vger.kernel.org>, Chao Yu <yuchao0@huawei.com>
Cc: Miao Xie <miaoxie@huawei.com>, linux-erofs@lists.ozlabs.org
Subject: [PATCH for-4.19 3/4] staging: erofs: add two missing erofs_workgroup_put for corrupted images
Date: Wed, 9 Oct 2019 18:12:38 +0800 [thread overview]
Message-ID: <20191009101239.195587-3-gaoxiang25@huawei.com> (raw)
In-Reply-To: <20191009101239.195587-1-gaoxiang25@huawei.com>
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[ 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>
---
drivers/staging/erofs/unzip_vle.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c
index fc44f5ce670b..7bd406f34f8b 100644
--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -311,7 +311,11 @@ z_erofs_vle_work_lookup(struct super_block *sb,
/* if multiref is disabled, `primary' is always true */
primary = true;
- DBG_BUGON(work->pageofs != pageofs);
+ if (work->pageofs != pageofs) {
+ DBG_BUGON(1);
+ erofs_workgroup_put(egrp);
+ return ERR_PTR(-EIO);
+ }
/*
* lock must be taken first to avoid grp->next == NIL between
--
2.17.1
next prev parent reply other threads:[~2019-10-09 10:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 10:12 [PATCH for-4.19 1/4] staging: erofs: fix an error handling in erofs_readdir() Gao Xiang
2019-10-09 10:12 ` [PATCH for-4.19 2/4] staging: erofs: some compressed cluster should be submitted for corrupted images Gao Xiang
2019-10-09 13:36 ` Patch "staging: erofs: some compressed cluster should be submitted for corrupted images" has been added to the 4.19-stable tree gregkh
2019-10-09 10:12 ` Gao Xiang [this message]
2019-10-09 13:36 ` Patch "staging: erofs: add two missing erofs_workgroup_put " gregkh
2019-10-09 10:12 ` [PATCH for-4.19 4/4] staging: erofs: detect potential multiref due to corrupted images Gao Xiang
2019-10-09 13:36 ` Patch "staging: erofs: detect potential multiref due to corrupted images" has been added to the 4.19-stable tree gregkh
2019-10-09 13:36 ` Patch "staging: erofs: fix an error handling in erofs_readdir()" " gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191009101239.195587-3-gaoxiang25@huawei.com \
--to=gaoxiang25@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=miaoxie@huawei.com \
--cc=stable@vger.kernel.org \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).