From: Xin Long <lucien.xin@gmail.com>
To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
Michael Tuexen <tuexen@fh-muenster.de>,
Tom Herbert <therbert@google.com>,
davem@davemloft.net
Subject: [PATCH net-next 01/15] udp: check udp sock encap_type in __udp_lib_err
Date: Tue, 29 Sep 2020 21:48:53 +0800 [thread overview]
Message-ID: <51c1fdad515076f3014476711aec1c0a81c18d36.1601387231.git.lucien.xin@gmail.com> (raw)
Message-ID: <20200929134853.BTPRHsegTdmq5rSkdaKo1KvEv4kC789QuNb_eNN4x7M@z> (raw)
In-Reply-To: <cover.1601387231.git.lucien.xin@gmail.com>
In-Reply-To: <cover.1601387231.git.lucien.xin@gmail.com>
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>
---
net/ipv4/udp.c | 2 +-
net/ipv6/udp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 09f0a23..ca04a8a 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -702,7 +702,7 @@ int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)
sk = __udp4_lib_lookup(net, iph->daddr, uh->dest,
iph->saddr, uh->source, skb->dev->ifindex,
inet_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(&udp_encap_needed_key)) {
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 29d9691..cde9b88 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)) {
--
2.1.0
next prev parent reply other threads:[~2020-09-29 13:49 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 13:48 [PATCH net-next 00/15] sctp: Implement RFC6951: UDP Encapsulation of SCTP Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` Xin Long [this message]
2020-09-29 13:48 ` [PATCH net-next 01/15] udp: check udp sock encap_type in __udp_lib_err Xin Long
2020-09-29 13:48 ` [PATCH net-next 02/15] udp6: move the mss check after udp gso tunnel processing Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 03/15] udp: do checksum properly in skb_udp_tunnel_segment Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 04/15] udp: support sctp over udp " Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 05/15] sctp: create udp4 sock and add its encap_rcv Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 06/15] sctp: create udp6 sock and set " Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 07/15] sctp: add encap_err_lookup for udp encap socks Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 08/15] sctp: add encap_port for netns sock asoc and transport Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 09/15] sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 10/15] sctp: allow changing transport encap_port by peer packets Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 11/15] sctp: add udphdr to overhead when udp_port is set Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 12/15] sctp: call sk_setup_caps in sctp_packet_transmit instead Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 13/15] sctp: support for sending packet over udp4 sock Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 14/15] sctp: support for sending packet over udp6 sock Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 15/15] sctp: enable udp tunneling socks Xin Long
2020-09-29 13:49 ` Xin Long
2020-10-03 4:12 ` Marcelo Ricardo Leitner
2020-10-03 4:12 ` Marcelo Ricardo Leitner
2020-10-03 8:20 ` Xin Long
2020-10-03 8:20 ` Xin Long
2020-09-29 16:25 ` [PATCH net-next 13/15] sctp: support for sending packet over udp4 sock kernel test robot
2020-09-29 16:25 ` kernel test robot
2020-09-30 6:26 ` Xin Long
2020-09-30 6:26 ` Xin Long
2020-09-29 19:19 ` kernel test robot
2020-09-29 19:19 ` kernel test robot
2020-10-03 4:09 ` [PATCH net-next 12/15] sctp: call sk_setup_caps in sctp_packet_transmit instead Marcelo Ricardo Leitner
2020-10-03 4:09 ` Marcelo Ricardo Leitner
2020-10-03 7:45 ` Xin Long
2020-10-03 7:45 ` Xin Long
2020-09-29 19:00 ` [PATCH net-next 11/15] sctp: add udphdr to overhead when udp_port is set kernel test robot
2020-09-29 19:00 ` kernel test robot
2020-10-03 4:08 ` Marcelo Ricardo Leitner
2020-10-03 4:08 ` Marcelo Ricardo Leitner
2020-10-03 7:57 ` Xin Long
2020-10-03 8:12 ` Xin Long
2020-10-03 11:23 ` Xin Long
2020-10-03 11:23 ` Xin Long
2020-10-03 12:24 ` Xin Long
2020-10-03 12:24 ` Xin Long
2020-10-05 19:01 ` Marcelo Ricardo Leitner
2020-10-05 19:01 ` Marcelo Ricardo Leitner
2020-10-05 20:08 ` Michael Tuexen
2020-10-05 20:08 ` Michael Tuexen
2020-10-08 9:37 ` Xin Long
2020-10-08 9:37 ` Xin Long
2020-10-03 4:07 ` Marcelo Ricardo Leitner
2020-10-03 4:07 ` Marcelo Ricardo Leitner
2020-10-03 7:54 ` Xin Long
2020-10-03 7:54 ` Xin Long
2020-10-03 4:06 ` [PATCH net-next 10/15] sctp: allow changing transport encap_port by peer packets Marcelo Ricardo Leitner
2020-10-03 4:06 ` Marcelo Ricardo Leitner
2020-10-03 4:05 ` [PATCH net-next 09/15] sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt Marcelo Ricardo Leitner
2020-10-03 4:05 ` Marcelo Ricardo Leitner
2020-10-03 7:41 ` Xin Long
2020-10-03 7:41 ` Xin Long
2020-10-03 4:04 ` [PATCH net-next 03/15] udp: do checksum properly in skb_udp_tunnel_segment Marcelo Ricardo Leitner
2020-10-03 4:04 ` Marcelo Ricardo Leitner
2020-10-03 7:40 ` Xin Long
2020-10-03 7:40 ` Xin Long
2020-09-29 16:39 ` [PATCH net-next 00/15] sctp: Implement RFC6951: UDP Encapsulation of SCTP Michael Tuexen
2020-09-29 16:39 ` Michael Tuexen
2020-09-29 17:49 ` Xin Long
2020-09-29 18:04 ` Xin Long
2020-10-01 12:41 ` Marcelo Ricardo Leitner
2020-10-01 12:41 ` Marcelo Ricardo Leitner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51c1fdad515076f3014476711aec1c0a81c18d36.1601387231.git.lucien.xin@gmail.com \
--to=lucien.xin@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=therbert@google.com \
--cc=tuexen@fh-muenster.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).