Commit ee45197c authored by Gao Xiang's avatar Gao Xiang Committed by Greg Kroah-Hartman

staging: erofs: some compressed cluster should be submitted for corrupted images

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: 3883a79a ("staging: erofs: introduce VLE decompression support")
Cc: <stable@vger.kernel.org> # 4.19+
Signed-off-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20190819103426.87579-2-gaoxiang25@huawei.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent acb383f1
...@@ -1307,19 +1307,18 @@ static int z_erofs_vle_normalaccess_readpage(struct file *file, ...@@ -1307,19 +1307,18 @@ static int z_erofs_vle_normalaccess_readpage(struct file *file,
err = z_erofs_do_read_page(&f, page, &pagepool); err = z_erofs_do_read_page(&f, page, &pagepool);
(void)z_erofs_collector_end(&f.clt); (void)z_erofs_collector_end(&f.clt);
if (err) { /* if some compressed cluster ready, need submit them anyway */
z_erofs_submit_and_unzip(inode->i_sb, &f.clt, &pagepool, true);
if (err)
errln("%s, failed to read, err [%d]", __func__, err); errln("%s, failed to read, err [%d]", __func__, err);
goto out;
}
z_erofs_submit_and_unzip(inode->i_sb, &f.clt, &pagepool, true);
out:
if (f.map.mpage) if (f.map.mpage)
put_page(f.map.mpage); put_page(f.map.mpage);
/* clean up the remaining free pages */ /* clean up the remaining free pages */
put_pages_list(&pagepool); put_pages_list(&pagepool);
return 0; return err;
} }
static bool should_decompress_synchronously(struct erofs_sb_info *sbi, static bool should_decompress_synchronously(struct erofs_sb_info *sbi,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment