Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-17 00:42:48 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-17 00:42:48 -0800
commitbd6f62e627fc083d31f74e40b0c1ed8fa73f9b02 (patch)
tree7d7c04e934df33f8643c1c5eb6c248ad783a080a
parent48a922f0dee24c7717efcd2b60bcd12b3482a53a (diff)
parentf8eabec2498fbaaad830cd7fe75344cc758e60cf (diff)
Merge bk://kernel.bkbits.net/gregkh/linux/merge-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
-rw-r--r--drivers/net/ppp_async.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index a48e19391208..33b9d79b1aad 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -1000,7 +1000,7 @@ static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
data += 4;
dlen -= 4;
/* data[0] is code, data[1] is length */
- while (dlen >= 2 && dlen >= data[1]) {
+ while (dlen >= 2 && dlen >= data[1] && data[1] >= 2) {
switch (data[0]) {
case LCP_MRU:
val = (data[2] << 8) + data[3];