summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-23 11:13:00 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-23 11:13:00 -0700
commit36e82dfda526e2dea26060e8766bda5a8110c4e6 (patch)
tree9a6e300dadc47356bbed60ccd3dc7df72235b391 /drivers
parent0f851021c0f91e5073fa89f26b5ac68e23df8e11 (diff)
parent7c5050e3e49f6d89af0d63111611693d9625d1f5 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ppp_async.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 933e2f3c77a..caabbc408c3 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -802,9 +802,9 @@ process_input_packet(struct asyncppp *ap)
/* check for address/control and protocol compression */
p = skb->data;
- if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) {
+ if (p[0] == PPP_ALLSTATIONS) {
/* chop off address/control */
- if (skb->len < 3)
+ if (p[1] != PPP_UI || skb->len < 3)
goto err;
p = skb_pull(skb, 2);
}