diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-06-24 02:04:11 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-06-24 02:04:11 -0400 |
commit | 7e4a6da7c2a1e0df06b71dc4ddc31910229ba9d9 (patch) | |
tree | d08daa0a33f114428ffa65803f76f42c499e35c9 /drivers | |
parent | 64beb8f3eb3c724add64ca3272915528e10213c1 (diff) |
[PPP]: Revert 606f585e363527da9feaed79465132c0c661fd9e
This can cause packet buffer overflows in certain cases,
the real bug will be fixed differently in a followon
changeset.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ppp_mppe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index 5ae80bbe2edc..d5bdd2574659 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 | * To account for possible PFC we should only subtract 1 | 496 | * Note that for our test we only subtract 1 byte whereas in |
497 | * byte whereas in mppe_compress() we added 2 bytes (+MPPE_OVHD); | 497 | * mppe_compress() we added 2 bytes (+MPPE_OVHD); |
498 | * However, we assume no PFC, thus subtracting 2 bytes. | 498 | * this is to account for possible PFC. |
499 | */ | 499 | */ |
500 | if (osize < isize - MPPE_OVHD - 2) { | 500 | if (osize < isize - MPPE_OVHD - 1) { |
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 - 2); | 503 | osize, isize - MPPE_OVHD - 1); |
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 */ |