Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 57714
b: refs/heads/master
c: 606f585
h: refs/heads/master
v: v3
  • Loading branch information
Konstantin Sharlaimov authored and David S. Miller committed Jun 12, 2007
1 parent c1856ac commit 46a3038
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9cadcd28f05e1957a8f61ae726fce31d0b29a3f9
refs/heads/master: 606f585e363527da9feaed79465132c0c661fd9e
10 changes: 5 additions & 5 deletions trunk/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 46a3038

Please sign in to comment.