]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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:38:40 +0000 (08:38 +0200)
commit8e4b4da3d3d9c163fef201cb9cf76c17a6e932e4
tree27a37a1a3bf84f71c910115f0813d155271305d4
parent167019572ca89fee8ad8dc98c70203c105c97e53
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: Sasha Levin <sashal@kernel.org>
net/ipv6/ip6_tunnel.c