From: <gregkh@linuxfoundation.org>
To: 20190821140152.229648-1-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: detect potential multiref due to corrupted images" has been added to the 4.19-stable tree
Date: Wed, 09 Oct 2019 15:36:22 +0200 [thread overview]
Message-ID: <157062818228179@kroah.com> (raw)
In-Reply-To: <20191009101239.195587-4-gaoxiang25@huawei.com>
This is a note to let you know that I've just added the patch titled
staging: erofs: detect potential multiref due to 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-detect-potential-multiref-due-to-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:39 +0800
Subject: staging: erofs: detect potential multiref due to 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-4-gaoxiang25@huawei.com>
From: Gao Xiang <gaoxiang25@huawei.com>
commit e12a0ce2fa69798194f3a8628baf6edfbd5c548f upstream.
As reported by erofs-utils fuzzer, currently, multiref
(ondisk deduplication) hasn't been supported for now,
we should forbid it properly.
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/20190821140152.229648-1-gaoxiang25@huawei.com
[ Gao Xiang: Since earlier kernels don't define EFSCORRUPTED,
let's use EIO instead. ]
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/erofs/unzip_vle.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -857,6 +857,7 @@ repeat:
for (i = 0; i < nr_pages; ++i)
pages[i] = NULL;
+ err = 0;
z_erofs_pagevec_ctor_init(&ctor,
Z_EROFS_VLE_INLINE_PAGEVECS, work->pagevec, 0);
@@ -878,8 +879,17 @@ repeat:
pagenr = z_erofs_onlinepage_index(page);
DBG_BUGON(pagenr >= nr_pages);
- DBG_BUGON(pages[pagenr]);
+ /*
+ * currently EROFS doesn't support multiref(dedup),
+ * so here erroring out one multiref page.
+ */
+ if (pages[pagenr]) {
+ DBG_BUGON(1);
+ SetPageError(pages[pagenr]);
+ z_erofs_onlinepage_endio(pages[pagenr]);
+ err = -EIO;
+ }
pages[pagenr] = page;
}
sparsemem_pages = i;
@@ -889,7 +899,6 @@ repeat:
overlapped = false;
compressed_pages = grp->compressed_pages;
- err = 0;
for (i = 0; i < clusterpages; ++i) {
unsigned pagenr;
@@ -915,7 +924,12 @@ repeat:
pagenr = z_erofs_onlinepage_index(page);
DBG_BUGON(pagenr >= nr_pages);
- DBG_BUGON(pages[pagenr]);
+ if (pages[pagenr]) {
+ DBG_BUGON(1);
+ SetPageError(pages[pagenr]);
+ z_erofs_onlinepage_endio(pages[pagenr]);
+ err = -EIO;
+ }
++sparsemem_pages;
pages[pagenr] = page;
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:36 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 ` [PATCH for-4.19 3/4] staging: erofs: add two missing erofs_workgroup_put for corrupted images 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 ` gregkh [this message]
2019-10-09 13:36 ` Patch "staging: erofs: fix an error handling in erofs_readdir()" has been added to the 4.19-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=157062818228179@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=20190821140152.229648-1-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).