aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp_generic.c
diff options
context:
space:
mode:
authorKonstantin Sharlaimov <konstantin.sharlaimov@gmail.com>2007-08-21 00:12:44 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-08-21 20:59:35 -0700
commit06c7af563d925d04961ce70cd9154fad8e2750c8 (patch)
tree22dd9853858a98283c258814290c14316a0f17fc /drivers/net/ppp_generic.c
parent2c20d72aaadd41fdf0a3b6cb8514c2f7b7d263e4 (diff)
downloadkernel_samsung_smdk4412-06c7af563d925d04961ce70cd9154fad8e2750c8.zip
kernel_samsung_smdk4412-06c7af563d925d04961ce70cd9154fad8e2750c8.tar.gz
kernel_samsung_smdk4412-06c7af563d925d04961ce70cd9154fad8e2750c8.tar.bz2
[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>
Diffstat (limited to 'drivers/net/ppp_generic.c')
-rw-r--r--drivers/net/ppp_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index ef3325b..9293c82 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1726,7 +1726,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. */