aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Sharlaimov <konstantin.sharlaimov@gmail.com>2007-06-12 17:16:59 -0400
committerDavid S. Miller <davem@davemloft.net>2007-06-12 17:16:59 -0400
commit606f585e363527da9feaed79465132c0c661fd9e (patch)
tree1a4b22b46173ba2104211e54aa65375b25da5c65
parent9cadcd28f05e1957a8f61ae726fce31d0b29a3f9 (diff)
[PPP_MPPE]: Fix "osize too small" check.
Prevent mppe_decompress() from generating "osize too small" errors when checking for output buffer size. When receiving a packet of mru size the output buffer for decrypted data is 1 byte too small since mppe_decompress() tries to account for possible PFC, however later in code it is assumed no PFC. Adjusting the check prevented these errors from occurring. Signed-off-by: Konstantin Sharlaimov <konstantin.sharlaimov@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ppp_mppe.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index d5bdd2574659..5ae80bbe2edc 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -493,14 +493,14 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
493 493
494 /* 494 /*
495 * Make sure we have enough room to decrypt the packet. 495 * Make sure we have enough room to decrypt the packet.
496 * Note that for our test we only subtract 1 byte whereas in 496 * To account for possible PFC we should only subtract 1
497 * mppe_compress() we added 2 bytes (+MPPE_OVHD); 497 * byte whereas in mppe_compress() we added 2 bytes (+MPPE_OVHD);
498 * this is to account for possible PFC. 498 * However, we assume no PFC, thus subtracting 2 bytes.
499 */ 499 */
500 if (osize < isize - MPPE_OVHD - 1) { 500 if (osize < isize - MPPE_OVHD - 2) {
501 printk(KERN_DEBUG "mppe_decompress[%d]: osize too small! " 501 printk(KERN_DEBUG "mppe_decompress[%d]: osize too small! "
502 "(have: %d need: %d)\n", state->unit, 502 "(have: %d need: %d)\n", state->unit,
503 osize, isize - MPPE_OVHD - 1); 503 osize, isize - MPPE_OVHD - 2);
504 return DECOMP_ERROR; 504 return DECOMP_ERROR;
505 } 505 }
506 osize = isize - MPPE_OVHD - 2; /* assume no PFC */ 506 osize = isize - MPPE_OVHD - 2; /* assume no PFC */