diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2016-05-19 15:58:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-24 10:18:16 -0700 |
| commit | ab1f253ddccc235520fa4f70d32a8dd6bf8ef346 (patch) | |
| tree | 6987771cbaf34563f6989a7467d1d41d918c53a2 /net/ipv4/udp.c | |
| parent | 5b7ea922e1754107f77d146011612f2e42600cc1 (diff) | |
| download | linux-stable-ab1f253ddccc235520fa4f70d32a8dd6bf8ef346.tar.gz linux-stable-ab1f253ddccc235520fa4f70d32a8dd6bf8ef346.tar.bz2 linux-stable-ab1f253ddccc235520fa4f70d32a8dd6bf8ef346.zip | |
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 21fbb54f11d0..44e1632370dd 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1531,7 +1531,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) /* if we're overly short, let UDP handle it */ encap_rcv = ACCESS_ONCE(up->encap_rcv); - if (skb->len > sizeof(struct udphdr) && encap_rcv) { + if (encap_rcv) { int ret; /* Verify checksum before giving to encap */ |