ip6_tunnel: Match to ARPHRD_TUNNEL6 for dev type
authorSheena Mira-ato <sheena.mira-ato@alliedtelesis.co.nz>
Mon, 1 Apr 2019 00:04:42 +0000 (13:04 +1300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Apr 2019 06:37:50 +0000 (08:37 +0200)
commitbc280a1edc23afabc04c97c04841d996e0788c6d
tree57f137a6f5f7b7dac07ed8c1dd4d0e9ae08988cb
parent5589e51fc8afb345561b6b880b349e6bc3bbf410
ip6_tunnel: Match to ARPHRD_TUNNEL6 for dev type

[ Upstream commit b2e54b09a3d29c4db883b920274ca8dca4d9f04d ]

The device type for ip6 tunnels is set to
ARPHRD_TUNNEL6. However, the ip4ip6_err function
is expecting the device type of the tunnel to be
ARPHRD_TUNNEL.  Since the device types do not
match, the function exits and the ICMP error
packet is not sent to the originating host. Note
that the device type for IPv4 tunnels is set to
ARPHRD_TUNNEL.

Fix is to expect a tunnel device type of
ARPHRD_TUNNEL6 instead.  Now the tunnel device
type matches and the ICMP error packet is sent
to the originating host.

Signed-off-by: Sheena Mira-ato <sheena.mira-ato@alliedtelesis.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/ip6_tunnel.c