diff options
| author | Konstantin Sharlaimov <konstantin.sharlaimov@gmail.com> | 2007-08-30 06:17:37 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2007-09-24 23:02:46 +0200 |
| commit | 725ad2a8f1358bff885414f5e91d253c99921ddc (patch) | |
| tree | dc3022778b3d5e26c98559196c178f5e60f9dae1 | |
| parent | 44315cc76567e2d911d56091665637e305af182d (diff) | |
| download | linux-stable-725ad2a8f1358bff885414f5e91d253c99921ddc.tar.gz linux-stable-725ad2a8f1358bff885414f5e91d253c99921ddc.tar.bz2 linux-stable-725ad2a8f1358bff885414f5e91d253c99921ddc.zip | |
[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.
--------------------
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.
--------------------
Signed-off-by: Konstantin Sharlaimov <konstantin.sharlaimov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
| -rw-r--r-- | drivers/net/ppp_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 802f249b87c8..80ff42d3e1c9 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -1739,7 +1739,7 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb) } /* 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. */ |