tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+2
-2
+2
-2
drivers/net/ppp_async.c
+2
-2
drivers/net/ppp_async.c
···
802
802
803
803
/* check for address/control and protocol compression */
804
804
p = skb->data;
805
-
if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) {
805
+
if (p[0] == PPP_ALLSTATIONS) {
806
806
/* chop off address/control */
807
-
if (skb->len < 3)
807
+
if (p[1] != PPP_UI || skb->len < 3)
808
808
goto err;
809
809
p = skb_pull(skb, 2);
810
810
}