From: <gregkh@linuxfoundation.org>
To: 20190819103426.87579-4-gaoxiang25@huawei.com,
gaoxiang25@huawei.com, gregkh@linuxfoundation.org,
linux-erofs@lists.ozlabs.org, miaoxie@huawei.com,
yuchao0@huawei.com
Cc: stable-commits@vger.kernel.org
Subject: Patch "staging: erofs: add two missing erofs_workgroup_put for corrupted images" has been added to the 5.3-stable tree
Date: Wed, 09 Oct 2019 15:27:07 +0200 [thread overview]
Message-ID: <1570627627222158@kroah.com> (raw)
In-Reply-To: <20191009100554.165048-3-gaoxiang25@huawei.com>
This is a note to let you know that I've just added the patch titled
staging: erofs: add two missing erofs_workgroup_put for corrupted images
to the 5.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-erofs-add-two-missing-erofs_workgroup_put-for-corrupted-images.patch
and it can be found in the queue-5.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From foo@baz Wed 09 Oct 2019 03:24:16 PM CEST
From: Gao Xiang <gaoxiang25@huawei.com>
Date: Wed, 9 Oct 2019 18:05:52 +0800
Subject: staging: erofs: add two missing erofs_workgroup_put for corrupted images
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, <stable@vger.kernel.org>, Chao Yu <yuchao0@huawei.com>
Cc: <linux-erofs@lists.ozlabs.org>, Miao Xie <miaoxie@huawei.com>, Gao Xiang <gaoxiang25@huawei.com>
Message-ID: <20191009100554.165048-3-gaoxiang25@huawei.com>
From: Gao Xiang <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
[ 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>
---
drivers/staging/erofs/unzip_vle.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- 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_e
/* 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
Patches currently in stable-queue which might be from gaoxiang25@huawei.com are
queue-5.3/staging-erofs-fix-an-error-handling-in-erofs_readdir.patch
queue-5.3/staging-erofs-detect-potential-multiref-due-to-corrupted-images.patch
queue-5.3/staging-erofs-avoid-endless-loop-of-invalid-lookback-distance-0.patch
queue-5.3/staging-erofs-some-compressed-cluster-should-be-submitted-for-corrupted-images.patch
queue-5.3/staging-erofs-add-two-missing-erofs_workgroup_put-for-corrupted-images.patch
next prev parent reply other threads:[~2019-10-09 13:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 10:05 [PATCH for-5.3 1/5] staging: erofs: fix an error handling in erofs_readdir() Gao Xiang
2019-10-09 10:05 ` [PATCH for-5.3 2/5] staging: erofs: some compressed cluster should be submitted for corrupted images Gao Xiang
2019-10-09 13:27 ` Patch "staging: erofs: some compressed cluster should be submitted for corrupted images" has been added to the 5.3-stable tree gregkh
2019-10-09 10:05 ` [PATCH for-5.3 3/5] staging: erofs: add two missing erofs_workgroup_put for corrupted images Gao Xiang
2019-10-09 13:27 ` gregkh [this message]
2019-10-09 10:05 ` [PATCH for-5.3 4/5] staging: erofs: avoid endless loop of invalid lookback distance 0 Gao Xiang
2019-10-09 13:27 ` Patch "staging: erofs: avoid endless loop of invalid lookback distance 0" has been added to the 5.3-stable tree gregkh
2019-10-09 10:05 ` [PATCH for-5.3 5/5] staging: erofs: detect potential multiref due to corrupted images Gao Xiang
2019-10-09 13:27 ` Patch "staging: erofs: detect potential multiref due to corrupted images" has been added to the 5.3-stable tree 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=1570627627222158@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=20190819103426.87579-4-gaoxiang25@huawei.com \
--cc=gaoxiang25@huawei.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=miaoxie@huawei.com \
--cc=stable-commits@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).