netdev - Re: [PATCH] Fix ppp_deflate issues with recent zlib

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20070503171145.aafa29fb.akpm@linux-foundation.org>
Date:	Thu, 3 May 2007 17:11:45 -0700
From:	Andrew Morton <akpm@...ux-foundation.org>
To:	Richard Purdie <rpurdie@...ys.net>
Cc:	Stefan Wenk <stefan.wenk@....at>, netdev@...r.kernel.org
Subject: Re: [PATCH] Fix ppp_deflate issues with recent zlib_inflate changes

On Thu, 03 May 2007 23:18:09 +0100
Richard Purdie <rpurdie@...ys.net> wrote:

> The last zlib_inflate update broke certain corner cases for ppp_deflate
> decompression handling. This patch fixes some logic to make things work
> properly again. Users other than ppp_deflate (the only Z_PACKET_FLUSH
> user) should be unaffected.
> 
> Fixes bug 8405 (confirmed by the reporter).
> 
> Signed-off-by: Richard Purdie <rpurdie@...ys.net>
> 
> Index: linux/lib/zlib_inflate/inflate.c
> ===================================================================
> --- linux.orig/lib/zlib_inflate/inflate.c	2007-05-03 23:08:27.000000000 +0100
> +++ linux/lib/zlib_inflate/inflate.c	2007-05-03 23:09:39.000000000 +0100
> @@ -743,12 +743,14 @@ int zlib_inflate(z_streamp strm, int flu
>  
>      strm->data_type = state->bits + (state->last ? 64 : 0) +
>                        (state->mode == TYPE ? 128 : 0);
> -    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
> -        ret = Z_BUF_ERROR;
>  
>      if (flush == Z_PACKET_FLUSH && ret == Z_OK &&
> -            (strm->avail_out != 0 || strm->avail_in == 0))
> +            strm->avail_out != 0 && strm->avail_in == 0)
>  		return zlib_inflateSyncPacket(strm);
> +
> +    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
> +        ret = Z_BUF_ERROR;
> +
>      return ret;
>  }
>  

Thanks heaps, guys.  It was a tough one.  I'll tag it for 2.6.21.x too.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html