Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 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:
commit
36e82dfda5
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user