Skip to content

Commit

Permalink
[PPP_MPPE]: Fix "osize too small" check.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Konstantin Sharlaimov authored and David S. Miller committed Jun 12, 2007
1 parent 9cadcd2 commit 606f585
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/ppp_mppe.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,14 +493,14 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,

/*
* Make sure we have enough room to decrypt the packet.
* Note that for our test we only subtract 1 byte whereas in
* mppe_compress() we added 2 bytes (+MPPE_OVHD);
* this is to account for possible PFC.
* To account for possible PFC we should only subtract 1
* byte whereas in mppe_compress() we added 2 bytes (+MPPE_OVHD);
* However, we assume no PFC, thus subtracting 2 bytes.
*/
if (osize < isize - MPPE_OVHD - 1) {
if (osize < isize - MPPE_OVHD - 2) {
printk(KERN_DEBUG "mppe_decompress[%d]: osize too small! "
"(have: %d need: %d)\n", state->unit,
osize, isize - MPPE_OVHD - 1);
osize, isize - MPPE_OVHD - 2);
return DECOMP_ERROR;
}
osize = isize - MPPE_OVHD - 2; /* assume no PFC */
Expand Down

0 comments on commit 606f585

Please sign in to comment.