diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2016-04-03 16:09:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-04 22:00:28 +0200 |
| commit | be447f305494e019dfc37ea4cdf3b0e4200b4eba (patch) | |
| tree | 7bfc596ff99287a234d6c116d36aa66bc1ff4764 | |
| parent | ipv4: l2tp: fix a potential issue in l2tp_ip_recv (diff) | |
| download | linux-be447f305494e019dfc37ea4cdf3b0e4200b4eba.tar.xz linux-be447f305494e019dfc37ea4cdf3b0e4200b4eba.zip | |
ipv6: l2tp: fix a potential issue in l2tp_ip6_recv
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>
| -rw-r--r-- | net/l2tp/l2tp_ip6.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index 6b54ff3ff4cb..cd479903d943 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -136,12 +136,11 @@ static int l2tp_ip6_recv(struct sk_buff *skb) struct l2tp_tunnel *tunnel = NULL; int length; - /* Point to L2TP header */ - optr = ptr = skb->data; - if (!pskb_may_pull(skb, 4)) goto discard; + /* Point to L2TP header */ + optr = ptr = skb->data; session_id = ntohl(*((__be32 *) ptr)); ptr += 4; @@ -169,6 +168,9 @@ static int l2tp_ip6_recv(struct sk_buff *skb) if (!pskb_may_pull(skb, length)) goto discard; + /* Point to L2TP header */ + optr = ptr = skb->data; + ptr += 4; pr_debug("%s: ip recv\n", tunnel->name); print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length); } |