Commit cbf12540 authored by Mikhail Zaslonko's avatar Mikhail Zaslonko Committed by Andrew Morton
Browse files

lib/zlib: DFLTCC not writing header bits when avail_out == 0 

This commit is based on:
  https://github.com/zlib-ng/zlib-ng/commit/ce409c6

Link: https://lkml.kernel.org/r/20230126131428.1222214-6-zaslonko@linux.ibm.com


Signed-off-by: default avatarMikhail Zaslonko <zaslonko@linux.ibm.com>
Acked-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0dbae465

lib/zlib_dfltcc/dfltcc_deflate.c

+9 −4
Original line number Diff line number Diff line
@@ -170,12 +170,17 @@ int dfltcc_deflate( 
            param->bcf = 0;

            dfltcc_state->block_threshold =

                strm->total_in + dfltcc_state->block_size;

        }

    }



    /* 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