From: Simon Arlott Date: Mon, 3 May 2010 10:19:33 +0000 (+0000) Subject: ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid X-Git-Tag: v2.6.34-rc7~20^2~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea8420e9f5dff7324607671f0b7ab7fbf726339d;p=pandora-kernel.git ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid In ppp_input(), PPP_PROTO(skb) may refer to invalid data in the skb. If this happens and (proto >= 0xc000 || proto == PPP_CCPFRAG) then the packet is passed directly to pppd. This occurs frequently when using PPPoE with an interface MTU greater than 1500 because the skb is more likely to be non-linear. The next 2 bytes need to be pulled in ppp_input(). The pull of 2 bytes in ppp_receive_frame() has been removed as it is no longer required. Signed-off-by: Simon Arlott Signed-off-by: David S. Miller --- Reading git-diff-tree failed