From: Mikhail Zaslonko <zaslonko@linux.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Ilya Leoshkevich <iii@linux.ibm.com>,
Mikhail Zaslonko <zaslonko@linux.ibm.com>
Subject: [PATCH 5/8] lib/zlib: DFLTCC not writing header bits when avail_out == 0
Date: Thu, 26 Jan 2023 14:14:25 +0100 [thread overview]
Message-ID: <20230126131428.1222214-6-zaslonko@linux.ibm.com> (raw)
In-Reply-To: <20230126131428.1222214-1-zaslonko@linux.ibm.com>
This commit is based on:
https://github.com/zlib-ng/zlib-ng/commit/ce409c6
Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
lib/zlib_dfltcc/dfltcc_deflate.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/zlib_dfltcc/dfltcc_deflate.c b/lib/zlib_dfltcc/dfltcc_deflate.c
index 211d344710d5..d4c92f99808e 100644
--- a/lib/zlib_dfltcc/dfltcc_deflate.c
+++ b/lib/zlib_dfltcc/dfltcc_deflate.c
@@ -170,13 +170,18 @@ int dfltcc_deflate(
param->bcf = 0;
dfltcc_state->block_threshold =
strm->total_in + dfltcc_state->block_size;
- if (strm->avail_out == 0) {
- *result = need_more;
- return 1;
- }
}
}
+ /* No space for compressed data. If we proceed, dfltcc_cmpr() will return
+ * DFLTCC_CC_OP1_TOO_SHORT without buffering header bits, but we will still
+ * set BCF=1, which is wrong. Avoid complications and return early.
+ */
+ if (strm->avail_out == 0) {
+ *result = need_more;
+ return 1;
+ }
+
/* The caller gave us too much data. Pass only one block worth of
* uncompressed data to DFLTCC and mask the rest, so that on the next
* iteration we start a new block.
--
2.34.1
next prev parent reply other threads:[~2023-01-26 13:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 13:14 [PATCH 0/8] lib/zlib: Set of s390 DFLTCC related patches for kernel zlib Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 1/8] lib/zlib: Adjust offset calculation for dfltcc_state Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 2/8] lib/zlib: Implement switching between DFLTCC and software Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 3/8] lib/zlib: Fix DFLTCC not flushing EOBS when creating raw streams Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 4/8] lib/zlib: Fix DFLTCC ignoring flush modes when avail_in == 0 Mikhail Zaslonko
2023-01-26 13:14 ` Mikhail Zaslonko [this message]
2023-01-26 13:14 ` [PATCH 6/8] lib/zlib: Split deflate and inflate states for DFLTCC Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 7/8] lib/zlib: DFLTCC support inflate with small window Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 8/8] lib/zlib: DFLTCC always switch to software inflate for Z_PACKET_FLUSH option Mikhail Zaslonko
2023-01-26 23:16 ` [PATCH 0/8] lib/zlib: Set of s390 DFLTCC related patches for kernel zlib Andrew Morton
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=20230126131428.1222214-6-zaslonko@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 \
/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
all inboxes | Powered by JetHome®