Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Vadim Fedorenko <vfedorenko@novek.ru>
To: David Ahern <dsahern@kernel.org>,
Willem de Bruijn <willemb@google.com>,
Paolo Abeni <pabeni@redhat.com>, Xin Long <lucien.xin@gmail.com>
Cc: Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, Vadim Fedorenko <vfedorenko@novek.ru>
Subject: [PATCH net 2/3] udp: check encap socket in __udp_lib_err
Date: Mon, 12 Jul 2021 03:55:53 +0300 [thread overview]
Message-ID: <20210712005554.26948-3-vfedorenko@novek.ru> (raw)
In-Reply-To: <20210712005554.26948-1-vfedorenko@novek.ru>
Commit d26796ae5894 ("udp: check udp sock encap_type in __udp_lib_err")
added checks for encapsulated sockets but it broke cases when there is
no implementation of encap_err_lookup for encapsulation, i.e. ESP in
UDP encapsulation. Fix it by calling encap_err_lookup only if socket
implements this method otherwise treat it as legal socket.
Fixes: d26796ae5894 ("udp: check udp sock encap_type in __udp_lib_err")
Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru>
---
net/ipv4/udp.c | 24 +++++++++++++++++++++++-
net/ipv6/udp.c | 22 ++++++++++++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index e5cb7fedfbcd..4980e0f19990 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -707,7 +707,29 @@ 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 || udp_sk(sk)->encap_enabled) {
+ if (sk && udp_sk(sk)->encap_enabled) {
+ int (*lookup)(struct sock *sk, struct sk_buff *skb);
+
+ lookup = READ_ONCE(udp_sk(sk)->encap_err_lookup);
+ if (lookup) {
+ int network_offset, transport_offset;
+
+ network_offset = skb_network_offset(skb);
+ transport_offset = skb_transport_offset(skb);
+
+ /* Network header needs to point to the outer IPv4 header inside ICMP */
+ skb_reset_network_header(skb);
+
+ /* Transport header needs to point to the UDP header */
+ skb_set_transport_header(skb, iph->ihl << 2);
+ if (lookup(sk, skb))
+ sk = NULL;
+ skb_set_transport_header(skb, transport_offset);
+ skb_set_network_header(skb, network_offset);
+ }
+ }
+
+ if (!sk) {
/* 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 798916d2e722..ed49a8589d9f 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -558,6 +558,28 @@ 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 && udp_sk(sk)->encap_enabled) {
+ int (*lookup)(struct sock *sk, struct sk_buff *skb);
+
+ lookup = READ_ONCE(udp_sk(sk)->encap_err_lookup);
+ if (lookup) {
+ int network_offset, transport_offset;
+
+ network_offset = skb_network_offset(skb);
+ transport_offset = skb_transport_offset(skb);
+
+ /* Network header needs to point to the outer IPv6 header inside ICMP */
+ skb_reset_network_header(skb);
+
+ /* Transport header needs to point to the UDP header */
+ skb_set_transport_header(skb, offset);
+ if (lookup(sk, skb))
+ sk = NULL;
+ skb_set_transport_header(skb, transport_offset);
+ skb_set_network_header(skb, network_offset);
+ }
+ }
+
if (!sk || udp_sk(sk)->encap_enabled) {
/* No socket for error: try tunnels before discarding */
sk = ERR_PTR(-ENOENT);
--
2.18.4
next prev parent reply other threads:[~2021-07-12 0:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 0:55 [PATCH net 0/3] Fix PMTU for ESP-in-UDP encapsulation Vadim Fedorenko
2021-07-12 0:55 ` [PATCH net 1/3] udp: check for encap using encap_enable Vadim Fedorenko
2021-07-12 8:37 ` Paolo Abeni
2021-07-12 12:32 ` Vadim Fedorenko
2021-07-12 14:05 ` Paolo Abeni
2021-07-12 14:13 ` Vadim Fedorenko
2021-07-12 14:33 ` Paolo Abeni
2021-07-12 16:27 ` Vadim Fedorenko
2021-07-12 0:55 ` Vadim Fedorenko [this message]
2021-07-12 7:59 ` [PATCH net 2/3] udp: check encap socket in __udp_lib_err Willem de Bruijn
2021-07-12 12:09 ` Vadim Fedorenko
2021-07-12 9:07 ` Paolo Abeni
2021-07-12 12:45 ` Vadim Fedorenko
2021-07-12 13:37 ` Paolo Abeni
2021-07-12 14:05 ` Vadim Fedorenko
2021-07-12 14:09 ` Paolo Abeni
2021-07-16 17:50 ` Xin Long
2021-07-12 0:55 ` [PATCH net 3/3] selftests: net: add ESP-in-UDP PMTU test Vadim Fedorenko
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=20210712005554.26948-3-vfedorenko@novek.ru \
--to=vfedorenko@novek.ru \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=kuba@kernel.org \
--cc=lucien.xin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=willemb@google.com \
--subject='Re: [PATCH net 2/3] udp: check encap socket in __udp_lib_err' \
/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
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).