diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/net/ppp_async.c | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/ppp_async.c')
| -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 | } |