diff options
| author | Xin Long <lucien.xin@gmail.com> | 2020-10-29 08:04:55 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-30 23:23:33 +0100 |
| commit | d26796ae589401d209f63f462d5aee3746f3c51e (patch) | |
| tree | 4fc33ace0c7c3ffed5b09d70fa908d4c28adf921 /net/ipv6/udp.c | |
| parent | net: dsa: mv88e6xxx: fix vlan setup (diff) | |
| download | linux-d26796ae589401d209f63f462d5aee3746f3c51e.tar.xz linux-d26796ae589401d209f63f462d5aee3746f3c51e.zip | |
udp: check udp sock encap_type in __udp_lib_err
There is a chance that __udp4/6_lib_lookup() returns a udp encap
sock in __udp_lib_err(), like the udp encap listening sock may
use the same port as remote encap port, in which case it should
go to __udp4/6_lib_err_encap() for more validation before
processing the icmp packet.
This patch is to check encap_type in __udp_lib_err() for the
further validation for a encap sock.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 29d9691359b9..cde9b8874d4b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -560,7 +560,7 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source, inet6_iif(skb), inet6_sdif(skb), udptable, NULL); - if (!sk) { + if (!sk || udp_sk(sk)->encap_type) { /* No socket for error: try tunnels before discarding */ sk = ERR_PTR(-ENOENT); if (static_branch_unlikely(&udpv6_encap_needed_key)) { |