[PATCH] net/ipv4: reset mac head before call ip_tunnel_rcv()

[PATCH] net/ipv4: reset mac head before call ip_tunnel_rcv()

[Chen Minqiang]

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
---
 net/ipv4/ipip.c | 1 +
 net/ipv6/sit.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 43adfc1641ba..ba2b5fc8910f 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -242,6 +242,7 @@ static int ipip_tunnel_rcv(struct sk_buff *skb, u8 ipproto)
 			if (!tun_dst)
 				return 0;
 		}
+		skb_reset_mac_header(skb);
 		return ip_tunnel_rcv(tunnel, skb, tpi, tun_dst, log_ecn_error);
 	}
 
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 80610899a323..44a9674d06a6 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -739,6 +739,7 @@ static int sit_tunnel_rcv(struct sk_buff *skb, u8 ipproto)
 			tpi = &ipip_tpi;
 		if (iptunnel_pull_header(skb, 0, tpi->proto, false))
 			goto drop;
+		skb_reset_mac_header(skb);
 		return ip_tunnel_rcv(tunnel, skb, tpi, NULL, log_ecn_error);
 	}
 
-- 
2.17.1

Re: [PATCH] net/ipv4: reset mac head before call ip_tunnel_rcv()

[David Miller]

From: Chen Minqiang <ptpt52@gmail.com>
Date: Tue,  6 Aug 2019 18:47:31 +0800

> Signed-off-by: Chen Minqiang <ptpt52@gmail.com>

No commit message means I'm not even going to look at this patch and
try to understand it.

You must always completely explain, in detail, what change you are
making, how you are making it, and above all why you are making this
change.

Is there some bug you are fixing?  What is that bug and what does that
bug cause to happen?  Are there potential negative side effects to
your fix?  What are they and what was the cost/benefit analysis for
that?

Where was the bug introduced?  You must provide a proper Fixes: tag
which shows this.

Thank you.