From: Zaslonko Mikhail <zaslonko@linux.ibm.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org
Subject: Re: [PATCH] lib/zlib: fix inflating zlib streams on s390
Date: Wed, 16 Dec 2020 16:51:24 +0100 [thread overview]
Message-ID: <3994efae-3699-7a50-6081-3eeb3272c947@linux.ibm.com> (raw)
In-Reply-To: <20201215155551.894884-1-iii@linux.ibm.com>
Acked-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Please, also add:
Cc: <stable@vger.kernel.org> # 5.6
On 15.12.2020 16:55, Ilya Leoshkevich wrote:
> Decompressing zlib streams on s390 fails with "incorrect data check"
> error.
>
> Userspace zlib checks inflate_state.flags in order to byteswap checksums
> only for zlib streams, and s390 hardware inflate code, which was ported
> from there, tries to match this behavior. At the same time, kernel zlib
> does not use inflate_state.flags, so it contains essentially random
> values. For many use cases either zlib stream is zeroed out or checksum
> is not used, so this problem is masked, but at least SquashFS is still
> affected.
>
> Fix by always passing a checksum to and from the hardware as is, which
> matches zlib_inflate()'s expectations.
>
> Fixes: 126196100063 ("lib/zlib: add s390 hardware support for kernel zlib_inflate")
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> lib/zlib_dfltcc/dfltcc_inflate.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/zlib_dfltcc/dfltcc_inflate.c b/lib/zlib_dfltcc/dfltcc_inflate.c
> index db107016d29b..fb60b5a6a1cb 100644
> --- a/lib/zlib_dfltcc/dfltcc_inflate.c
> +++ b/lib/zlib_dfltcc/dfltcc_inflate.c
> @@ -125,7 +125,7 @@ dfltcc_inflate_action dfltcc_inflate(
> param->ho = (state->write - state->whave) & ((1 << HB_BITS) - 1);
> if (param->hl)
> param->nt = 0; /* Honor history for the first block */
> - param->cv = state->flags ? REVERSE(state->check) : state->check;
> + param->cv = state->check;
>
> /* Inflate */
> do {
> @@ -138,7 +138,7 @@ dfltcc_inflate_action dfltcc_inflate(
> state->bits = param->sbb;
> state->whave = param->hl;
> state->write = (param->ho + param->hl) & ((1 << HB_BITS) - 1);
> - state->check = state->flags ? REVERSE(param->cv) : param->cv;
> + state->check = param->cv;
> if (cc == DFLTCC_CC_OP2_CORRUPT && param->oesc != 0) {
> /* Report an error if stream is corrupted */
> state->mode = BAD;
>
prev parent reply other threads:[~2020-12-16 15:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 15:55 [PATCH] lib/zlib: fix inflating zlib streams on s390 Ilya Leoshkevich
2020-12-15 18:52 ` Christian Borntraeger
2020-12-16 15:51 ` Zaslonko Mikhail [this message]
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=3994efae-3699-7a50-6081-3eeb3272c947@linux.ibm.com \
--to=zaslonko@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
/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).