From: <gregkh@linuxfoundation.org>
To: 20190819103426.87579-2-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: some compressed cluster should be submitted for corrupted images" has been added to the 4.19-stable tree
Date: Wed, 09 Oct 2019 15:36:23 +0200 [thread overview]
Message-ID: <1570628183207241@kroah.com> (raw)
In-Reply-To: <20191009101239.195587-2-gaoxiang25@huawei.com>
This is a note to let you know that I've just added the patch titled
staging: erofs: some compressed cluster should be submitted for corrupted images
to the 4.19-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-some-compressed-cluster-should-be-submitted-for-corrupted-images.patch
and it can be found in the queue-4.19 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:26:06 PM CEST
From: Gao Xiang <gaoxiang25@huawei.com>
Date: Wed, 9 Oct 2019 18:12:37 +0800
Subject: staging: erofs: some compressed cluster should be submitted 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: <20191009101239.195587-2-gaoxiang25@huawei.com>
From: Gao Xiang <gaoxiang25@huawei.com>
commit ee45197c807895e156b2be0abcaebdfc116487c8 upstream.
As reported by erofs_utils fuzzer, a logical page can belong
to at most 2 compressed clusters, if one compressed cluster
is corrupted, but the other has been ready in submitting chain.
The chain needs to submit anyway in order to keep the page
working properly (page unlocked with PG_error set, PG_uptodate
not set).
Let's fix it now.
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-2-gaoxiang25@huawei.com
[ Gao Xiang: Manually backport to v4.19.y stable. ]
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/erofs/unzip_vle.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -1335,19 +1335,18 @@ static int z_erofs_vle_normalaccess_read
err = z_erofs_do_read_page(&f, page, &pagepool);
(void)z_erofs_vle_work_iter_end(&f.builder);
- if (err) {
+ /* if some compressed cluster ready, need submit them anyway */
+ z_erofs_submit_and_unzip(&f, &pagepool, true);
+
+ if (err)
errln("%s, failed to read, err [%d]", __func__, err);
- goto out;
- }
- z_erofs_submit_and_unzip(&f, &pagepool, true);
-out:
if (f.m_iter.mpage != NULL)
put_page(f.m_iter.mpage);
/* clean up the remaining free pages */
put_pages_list(&pagepool);
- return 0;
+ return err;
}
static inline int __z_erofs_vle_normalaccess_readpages(
Patches currently in stable-queue which might be from gaoxiang25@huawei.com are
queue-4.19/staging-erofs-fix-an-error-handling-in-erofs_readdir.patch
queue-4.19/staging-erofs-detect-potential-multiref-due-to-corrupted-images.patch
queue-4.19/staging-erofs-some-compressed-cluster-should-be-submitted-for-corrupted-images.patch
queue-4.19/staging-erofs-add-two-missing-erofs_workgroup_put-for-corrupted-images.patch
next prev parent reply other threads:[~2019-10-09 13:37 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 ` gregkh [this message]
2019-10-09 10:12 ` [PATCH for-4.19 3/4] staging: erofs: add two missing erofs_workgroup_put " Gao Xiang
2019-10-09 13:36 ` Patch "staging: erofs: add two missing erofs_workgroup_put for corrupted images" has been added to the 4.19-stable tree 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=1570628183207241@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=20190819103426.87579-2-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).