lib/zlib: DFLTCC always switch to software inflate for Z_PACKET_FLUSH…

… option Since hardware inflate does not support Z_PACKET_FLUSH option (used exclusively by kernel PPP driver), always switch to software like we already do for Z_BLOCK flush option. Without this patch, PPP might get Z_DATA_ERROR return code from zlib_inflate() and disable zlib compression for the packets. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Mikhail Zaslonko <[email protected]> Acked-by: Ilya Leoshkevich <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Vasily Gorbik <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
torvalds · Feb 3, 2023 · f65c35d · f65c35d
1 parent 9010dbc
commit f65c35d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/zlib_dfltcc/dfltcc_inflate.c b/lib/zlib_dfltcc/dfltcc_inflate.c
@@ -95,8 +95,10 @@ dfltcc_inflate_action dfltcc_inflate(
  struct dfltcc_param_v0 *param = &dfltcc_state->param;
  dfltcc_cc cc;
 
- if (flush == Z_BLOCK) {
- /* DFLTCC does not support stopping on block boundaries */
+ if (flush == Z_BLOCK || flush == Z_PACKET_FLUSH) {
+ /* DFLTCC does not support stopping on block boundaries (Z_BLOCK flush option)
+ * as well as the use of Z_PACKET_FLUSH option (used exclusively by PPP driver)
+ */
  if (dfltcc_inflate_disable(strm)) {
  *ret = Z_STREAM_ERROR;
  return DFLTCC_INFLATE_BREAK;