Xin Long c67ec7f940 ip_vti: receive ipip packet by calling ip_tunnel_rcv
commit 976eba8ab596bab94b9714cd46d38d5c6a2c660d upstream.

In Commit dd9ee3444014 ("vti4: Fix a ipip packet processing bug in
'IPCOMP' virtual tunnel"), it tries to receive IPIP packets in vti
by calling xfrm_input(). This case happens when a small packet or
frag sent by peer is too small to get compressed.

However, xfrm_input() will still get to the IPCOMP path where skb
sec_path is set, but never dropped while it should have been done
in vti_ipcomp4_protocol.cb_handler(vti_rcv_cb), as it's not an
ipcomp4 packet. This will cause that the packet can never pass
xfrm4_policy_check() in the upper protocol rcv functions.

So this patch is to call ip_tunnel_rcv() to process IPIP packets
instead.

Fixes: dd9ee3444014 ("vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel")
Reported-by: Xiumei Mu <xmu@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-06-03 08:16:45 +02:00
..
2019-05-08 07:19:07 +02:00
2019-12-05 15:35:12 +01:00
2019-09-16 08:19:32 +02:00
2019-06-22 08:17:22 +02:00
2016-10-20 11:23:08 -04:00
2020-05-20 08:15:39 +02:00
2019-03-23 13:19:44 +01:00
2019-11-28 18:28:28 +01:00
2019-01-09 16:16:41 +01:00