lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet()
This commit is contained in:
Linus Torvalds
2007-04-23 11:13:00 -07:00
parent 0f851021c0 7c5050e3e4
commit 36e82dfda5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ppp_async.c
View File

@@ -802,9 +802,9 @@ process_input_packet(struct asyncppp *ap)
/* check for address/control and protocol compression */ /* check for address/control and protocol compression */
p = skb->data; p = skb->data;
if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { if (p[0] == PPP_ALLSTATIONS) {
/* chop off address/control */ /* chop off address/control */
if (skb->len < 3) if (p[1] != PPP_UI || skb->len < 3)
goto err; goto err;
p = skb_pull(skb, 2); p = skb_pull(skb, 2);
} }