Re: [PATCH] Fix cryptoapi deflate not handling PAGE_SIZE chunks.

[Herbert Xu <herbert@gondor.apana.org.au>]

On Mon, Jul 18, 2005 at 01:26:35PM +1000, Nigel Cunningham wrote:
> 
> Here's a resend of a patch I'm using in Suspend2's new cryptoapi
> support, which is needed for us to successfully compress pages using
> deflate. It's along the lines of the existing fix in the decompression
> code.
>
> diff -ruNp 190-cryptoapi-deflate.patch-old/crypto/deflate.c 190-cryptoapi-deflate.patch-new/crypto/deflate.c
> --- 190-cryptoapi-deflate.patch-old/crypto/deflate.c	2005-06-20 11:46:49.000000000 +1000
> +++ 190-cryptoapi-deflate.patch-new/crypto/deflate.c	2005-07-04 23:14:20.000000000 +1000
> @@ -143,8 +143,15 @@ static int deflate_compress(void *ctx, c
>  
>  	ret = zlib_deflate(stream, Z_FINISH);
>  	if (ret != Z_STREAM_END) {
> -		ret = -EINVAL;
> -		goto out;
> +	    	if (!(ret == Z_OK && !stream->avail_in && !stream->avail_out)) {
> +			ret = -EINVAL;
> +			goto out;
> +		} else {
> +			u8 zerostuff = 0;
> +			stream->next_out = &zerostuff;
> +			stream->avail_out = 1; 
> +			ret = zlib_deflate(stream, Z_FINISH);
> +		}
>  	}
>  	ret = 0;
>  	*dlen = stream->total_out;

Hi Nigel, I need a bit more information about this patch.
Do you have a specific input stream that requires a fix like
this?

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/