projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32e2aa6
)
ipv6: l2tp: fix a potential issue in l2tp_ip6_recv
author
Haishuang Yan
<yanhaishuang@cmss.chinamobile.com>
Sun, 3 Apr 2016 14:09:24 +0000
(22:09 +0800)
committer
Danny Wood
<danwood76@gmail.com>
Tue, 29 Jan 2019 13:12:48 +0000
(13:12 +0000)
commit
be447f305494e019dfc37ea4cdf3b0e4200b4eba
upstream.
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
net/l2tp/l2tp_ip6.c
patch
|
blob
|
blame
|
history
diff --git
a/net/l2tp/l2tp_ip6.c
b/net/l2tp/l2tp_ip6.c
index 19705cbafdca8b22aed1bd92ff0232524f228e9b..7c1a288f0b20ac306316d73dd58d9115597b2d71 100644
(file)
--- a/
net/l2tp/l2tp_ip6.c
+++ b/
net/l2tp/l2tp_ip6.c
@@
-135,12
+135,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;
@@
-168,6
+167,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);
}