diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
| commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
| tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /drivers/net/ppp_async.c | |
| parent | 06d63cc51d47f572009138a7f3ac34d95773405d (diff) | |
| parent | de46c33745f5e2ad594c72f2cf5f490861b16ce1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | } |