Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PPP]: Revert 606f585e36

Browse source 
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>
This commit is contained in:
David S. Miller 2007-06-23 23:04:11 -07:00
parent 64beb8f3eb
commit 7e4a6da7c2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/ppp_mppe.c
View file

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