ipv4: l2tp: fix a potential issue in l2tp_ip_recv
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Sun, 3 Apr 2016 14:09:23 +0000 (22:09 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 30 Apr 2016 22:05:27 +0000 (00:05 +0200)
commitf56bbe05031ec62fed752671fdf510cc202b67cf
treeb5190ff5260eff1bac6f8a5d215392c4c5d370de
parent8b59e5023e8255a91418bd7831b5ef03621499d5
ipv4: l2tp: fix a potential issue in l2tp_ip_recv

[ Upstream commit 5745b8232e942abd5e16e85fa9b27cc21324acf0 ]

pskb_may_pull() can change skb->data, so we have to load ptr/optr at the
right place.

Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/l2tp/l2tp_ip.c