From: Konstantin Sharlaimov <konstantin.sharlaimov@gmail.com>
To: linux-ppp@vger.kernel.org
Subject: [PATCH 2.6.21.3] ppp_mppe: account for osize too small errors in
Date: Fri, 01 Jun 2007 10:31:48 +0000 [thread overview]
Message-ID: <465FF594.50901@gmail.com> (raw)
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 there errors from occurring.
Signed-off-by: Konstantin Sharlaimov <konstantin.sharlaimov@gmail.com>
---
--- linux-2.6.21.3/drivers/net/ppp_mppe.c.orig 2007-06-01
20:57:04.000000000 +1100
+++ linux-2.6.21.3/drivers/net/ppp_mppe.c 2007-06-01
21:08:03.000000000 +1100
@@ -493,14 +493,14 @@ mppe_decompress(void *arg, unsigned char
/*
* 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 */
reply other threads:[~2007-06-01 10:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=465FF594.50901@gmail.com \
--to=konstantin.sharlaimov@gmail.com \
--cc=linux-ppp@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.