Commit 91c52470 authored by Jacob Wen's avatar Jacob Wen Committed by David S. Miller

l2tp: copy 4 more bytes to linear part if necessary

The size of L2TPv2 header with all optional fields is 14 bytes.
l2tp_udp_recv_core only moves 10 bytes to the linear part of a
skb. This may lead to l2tp_recv_common read data outside of a skb.

This patch make sure that there is at least 14 bytes in the linear
part of a skb to meet the maximum need of l2tp_udp_recv_core and
l2tp_recv_common. The minimum size of both PPP HDLC-like frame and
Ethernet frame is larger than 14 bytes, so we are safe to do so.

Also remove L2TP_HDR_SIZE_NOSEQ, it is unused now.

Fixes: fd558d18 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Suggested-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarJacob Wen <jian.w.wen@oracle.com>
Acked-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3aa9179b
...@@ -83,8 +83,7 @@ ...@@ -83,8 +83,7 @@
#define L2TP_SLFLAG_S 0x40000000 #define L2TP_SLFLAG_S 0x40000000
#define L2TP_SL_SEQ_MASK 0x00ffffff #define L2TP_SL_SEQ_MASK 0x00ffffff
#define L2TP_HDR_SIZE_SEQ 10 #define L2TP_HDR_SIZE_MAX 14
#define L2TP_HDR_SIZE_NOSEQ 6
/* Default trace flags */ /* Default trace flags */
#define L2TP_DEFAULT_DEBUG_FLAGS 0 #define L2TP_DEFAULT_DEBUG_FLAGS 0
...@@ -808,7 +807,7 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb) ...@@ -808,7 +807,7 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb)
__skb_pull(skb, sizeof(struct udphdr)); __skb_pull(skb, sizeof(struct udphdr));
/* Short packet? */ /* Short packet? */
if (!pskb_may_pull(skb, L2TP_HDR_SIZE_SEQ)) { if (!pskb_may_pull(skb, L2TP_HDR_SIZE_MAX)) {
l2tp_info(tunnel, L2TP_MSG_DATA, l2tp_info(tunnel, L2TP_MSG_DATA,
"%s: recv short packet (len=%d)\n", "%s: recv short packet (len=%d)\n",
tunnel->name, skb->len); tunnel->name, skb->len);
......
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