diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-04-19 13:05:52 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2007-04-19 13:05:52 -0700 |
| commit | 7c5050e3e49f6d89af0d63111611693d9625d1f5 (patch) | |
| tree | 739b5eb674a433077fb3486f7c305ca1720b3215 /drivers/net | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm (diff) | |
| download | linux-dev-7c5050e3e49f6d89af0d63111611693d9625d1f5.tar.xz linux-dev-7c5050e3e49f6d89af0d63111611693d9625d1f5.zip | |
[PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet()
From: Paul Mackerras <paulus@samba.org>
This fixes:
Subject: kernel BUG at net/core/skbuff.c in linux-2.6.21-rc6
process_input_packet() treats the case where the first byte is 0xff
(PPP_ALLSTATIONS) but the second byte is 0x03 (PPP_UI) as indicating a
packet with a PPP protocol number of 0xff. Arguably that's wrong
since PPP protocol 0xff is reserved, and the RFC does envision the
possibility of receiving frames where the control field has values
other than 0x03.
Signed-off-by: David S. Miller <davem@davemloft.net>
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) /* 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); } |