projects/linux·commit 36e82dfd

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

36e82dfd · Linus Torvalds <[email protected]> · 2007-04-23 11:13:00 -07:00

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet()
Commit
36e82dfda526e2dea26060e8766bda5a8110c4e6
Parents
0f851021 · 7c5050e3

Merge commit. Changes below are compared with the first parent: 0f851021.

Changes

1 files changed · +2 −2

FileStatusAddDelContent
drivers/net/ppp_async.cmodified+2−2View file

drivers/net/ppp_async.c

View file
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 933e2f3..caabbc4 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);
}