* [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv
@ 2016-04-03 14:09 Haishuang Yan
2016-04-03 14:09 ` [PATCH 2/2] ipv6: l2tp: fix a potential issue in l2tp_ip6_recv Haishuang Yan
2016-04-04 20:01 ` [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Haishuang Yan @ 2016-04-03 14:09 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-kernel, Haishuang Yan
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>
---
net/l2tp/l2tp_ip.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index ec22078..42de4cc 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -123,12 +123,11 @@ static int l2tp_ip_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;
@@ -156,6 +155,9 @@ static int l2tp_ip_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);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ipv6: l2tp: fix a potential issue in l2tp_ip6_recv
2016-04-03 14:09 [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv Haishuang Yan
@ 2016-04-03 14:09 ` Haishuang Yan
2016-04-04 20:01 ` David Miller
2016-04-04 20:01 ` [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Haishuang Yan @ 2016-04-03 14:09 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-kernel, Haishuang Yan
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>
---
net/l2tp/l2tp_ip6.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 6b54ff3..cd47990 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);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv
2016-04-03 14:09 [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv Haishuang Yan
2016-04-03 14:09 ` [PATCH 2/2] ipv6: l2tp: fix a potential issue in l2tp_ip6_recv Haishuang Yan
@ 2016-04-04 20:01 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2016-04-04 20:01 UTC (permalink / raw)
To: yanhaishuang; +Cc: netdev, linux-kernel
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Sun, 3 Apr 2016 22:09:23 +0800
> 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>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ipv6: l2tp: fix a potential issue in l2tp_ip6_recv
2016-04-03 14:09 ` [PATCH 2/2] ipv6: l2tp: fix a potential issue in l2tp_ip6_recv Haishuang Yan
@ 2016-04-04 20:01 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2016-04-04 20:01 UTC (permalink / raw)
To: yanhaishuang; +Cc: netdev, linux-kernel
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Sun, 3 Apr 2016 22:09:24 +0800
> 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>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-04 20:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-03 14:09 [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv Haishuang Yan
2016-04-03 14:09 ` [PATCH 2/2] ipv6: l2tp: fix a potential issue in l2tp_ip6_recv Haishuang Yan
2016-04-04 20:01 ` David Miller
2016-04-04 20:01 ` [PATCH 1/2] ipv4: l2tp: fix a potential issue in l2tp_ip_recv David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.