From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Thu, 25 Jul 2019 03:07:56 +0000 (+0800)
Subject: ipip: validate header length in ipip_tunnel_xmit
X-Git-Tag: v5.3-rc4~36^2~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47d858d0bdcd47cc1c6c9eeca91b091dd9e55637;p=thirdparty%2Fkernel%2Flinux.git

ipip: validate header length in ipip_tunnel_xmit

We need the same checks introduced by commit cb9f1b783850
("ip: validate header length on virtual device xmit") for
ipip tunnel.

Fixes: cb9f1b783850b ("ip: validate header length on virtual device xmit")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 43adfc1641bac..2f01cf6fa0def 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -275,6 +275,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb,
 	const struct iphdr  *tiph = &tunnel->parms.iph;
 	u8 ipproto;
 
+	if (!pskb_inet_may_pull(skb))
+		goto tx_error;
+
 	switch (skb->protocol) {
 	case htons(ETH_P_IP):
 		ipproto = IPPROTO_IPIP;