]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
udp: prevent skbs lingering in tunnel socket queues
authorHannes Frederic Sowa <hannes@stressinduktion.org>
Thu, 19 May 2016 13:58:33 +0000 (15:58 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 16 Mar 2017 02:27:17 +0000 (02:27 +0000)
commitdf4db51ef4c17ee3bd81eee73b7ee89c14d389ef
tree53fc1c31225cfc61382073f7f27de7f07b460278
parent0a2628b8429935530ee212b5231f81f7f0d9375d
udp: prevent skbs lingering in tunnel socket queues

[ Upstream commit e5aed006be918af163eb397e45aa5ea6cefd5e01 ]

In case we find a socket with encapsulation enabled we should call
the encap_recv function even if just a udp header without payload is
available. The callbacks are responsible for correctly verifying and
dropping the packets.

Also, in case the header validation fails for geneve and vxlan we
shouldn't put the skb back into the socket queue, no one will pick
them up there.  Instead we can simply discard them in the respective
encap_recv functions.

Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16:
 - Drop changes to geneve
 - vxlan error checking looked a bit different]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/vxlan.c
net/ipv4/udp.c
net/ipv6/udp.c