Commit 7f73ba8d authored by Haishuang Yan's avatar Haishuang Yan Committed by Kamal Mostafa

ipv4: l2tp: fix a potential issue in l2tp_ip_recv

[ Upstream commit 5745b823 ]

pskb_may_pull() can change skb->data, so we have to load ptr/optr at the
right place.
Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 1d68d84b
...@@ -123,12 +123,11 @@ static int l2tp_ip_recv(struct sk_buff *skb) ...@@ -123,12 +123,11 @@ static int l2tp_ip_recv(struct sk_buff *skb)
struct l2tp_tunnel *tunnel = NULL; struct l2tp_tunnel *tunnel = NULL;
int length; int length;
/* Point to L2TP header */
optr = ptr = skb->data;
if (!pskb_may_pull(skb, 4)) if (!pskb_may_pull(skb, 4))
goto discard; goto discard;
/* Point to L2TP header */
optr = ptr = skb->data;
session_id = ntohl(*((__be32 *) ptr)); session_id = ntohl(*((__be32 *) ptr));
ptr += 4; ptr += 4;
...@@ -156,6 +155,9 @@ static int l2tp_ip_recv(struct sk_buff *skb) ...@@ -156,6 +155,9 @@ static int l2tp_ip_recv(struct sk_buff *skb)
if (!pskb_may_pull(skb, length)) if (!pskb_may_pull(skb, length))
goto discard; goto discard;
/* Point to L2TP header */
optr = ptr = skb->data;
ptr += 4;
pr_debug("%s: ip recv\n", tunnel->name); pr_debug("%s: ip recv\n", tunnel->name);
print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length); print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment