2007-08-17 09:46:20

by Konstantin Sharlaimov

Subject: [PATCH 2.6.22.3] ppp: fix output buffer size in ppp_decompress_frame

This patch addresses the issue with "osize too small" errors in mppe encryption.
The patch fixes the issue with wrong output buffer size being passed to ppp
decompression routine.

Signed-off-by: Konstantin Sharlaimov <[email protected]>
---
As pointed out by Suresh Mahalingam, the issue addressed by
ppp-fix-osize-too-small-errors-when-decoding patch is not fully resolved yet.
The size of allocated output buffer is correct, however it size passed to
ppp->rcomp->decompress in ppp_generic.c if wrong. The patch fixes that.

--- linux-2.6.21.3/drivers/net/ppp_generic.c.orig 2007-08-17 20:35:03.000000000 +1100
+++ linux-2.6.21.3/drivers/net/ppp_generic.c 2007-08-17 20:35:45.000000000 +1100
@@ -1726,7 +1726,7 @@ ppp_decompress_frame(struct ppp *ppp, st
}
/* the decompressor still expects the A/C bytes in the hdr */
len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2,
- skb->len + 2, ns->data, ppp->mru + PPP_HDRLEN);
+ skb->len + 2, ns->data, obuff_size);
if (len < 0) {
/* Pass the compressed frame to pppd as an
error indication. */

2007-08-21 07:13:36

by David Miller

Subject: Re: [PATCH 2.6.22.3] ppp: fix output buffer size in ppp_decompress_frame

From: Konstantin Sharlaimov <[email protected]>
Date: Fri, 17 Aug 2007 20:45:51 +1100

> This patch addresses the issue with "osize too small" errors in mppe encryption.
> The patch fixes the issue with wrong output buffer size being passed to ppp
> decompression routine.
>
> Signed-off-by: Konstantin Sharlaimov <[email protected]>
> ---
> As pointed out by Suresh Mahalingam, the issue addressed by
> ppp-fix-osize-too-small-errors-when-decoding patch is not fully resolved yet.
> The size of allocated output buffer is correct, however it size passed to
> ppp->rcomp->decompress in ppp_generic.c if wrong. The patch fixes that.

Patch applied, thanks.