diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-23 14:13:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-23 14:13:00 -0400 |
| commit | 36e82dfda526e2dea26060e8766bda5a8110c4e6 (patch) | |
| tree | 9a6e300dadc47356bbed60ccd3dc7df72235b391 /drivers/net | |
| parent | 0f851021c0f91e5073fa89f26b5ac68e23df8e11 (diff) | |
| parent | 7c5050e3e49f6d89af0d63111611693d9625d1f5 (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/net')
| -rw-r--r-- | drivers/net/ppp_async.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 933e2f3c77aa..caabbc408c34 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c | |||
| @@ -802,9 +802,9 @@ process_input_packet(struct asyncppp *ap) | |||
| 802 | 802 | ||
| 803 | /* check for address/control and protocol compression */ | 803 | /* check for address/control and protocol compression */ |
| 804 | p = skb->data; | 804 | p = skb->data; |
| 805 | if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { | 805 | if (p[0] == PPP_ALLSTATIONS) { |
| 806 | /* chop off address/control */ | 806 | /* chop off address/control */ |
| 807 | if (skb->len < 3) | 807 | if (p[1] != PPP_UI || skb->len < 3) |
| 808 | goto err; | 808 | goto err; |
| 809 | p = skb_pull(skb, 2); | 809 | p = skb_pull(skb, 2); |
| 810 | } | 810 | } |