From: Sabrina Dubroca <sd@queasysnail.net>
To: netdev@vger.kernel.org
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
Sabrina Dubroca <sd@queasysnail.net>
Subject: [PATCH RFC ipsec-next 5/7] esp4: prepare esp_input_done2 for non-UDP encapsulation
Date: Tue, 25 Jun 2019 12:11:38 +0200 [thread overview]
Message-ID: <14a335c24a30eb7772066d6b30be57972c47a977.1561457281.git.sd@queasysnail.net> (raw)
In-Reply-To: <cover.1561457281.git.sd@queasysnail.net>
For espintcp encapsulation, we will need to get the source port from the
TCP header instead of UDP. Introduce a variable to hold the port.
Co-developed-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
---
net/ipv4/esp4.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index c06562aded11..5608dd47ee97 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -603,6 +603,18 @@ int esp_input_done2(struct sk_buff *skb, int err)
if (x->encap) {
struct xfrm_encap_tmpl *encap = x->encap;
struct udphdr *uh = (void *)(skb_network_header(skb) + ihl);
+ __be16 source;
+
+ switch (x->encap->encap_type) {
+ case UDP_ENCAP_ESPINUDP:
+ case UDP_ENCAP_ESPINUDP_NON_IKE:
+ source = uh->source;
+ break;
+ default:
+ WARN_ON_ONCE(1);
+ err = -EINVAL;
+ goto out;
+ }
/*
* 1) if the NAT-T peer's IP or port changed then
@@ -611,11 +623,11 @@ int esp_input_done2(struct sk_buff *skb, int err)
* SRC ports.
*/
if (iph->saddr != x->props.saddr.a4 ||
- uh->source != encap->encap_sport) {
+ source != encap->encap_sport) {
xfrm_address_t ipaddr;
ipaddr.a4 = iph->saddr;
- km_new_mapping(x, &ipaddr, uh->source);
+ km_new_mapping(x, &ipaddr, source);
/* XXX: perhaps add an extra
* policy check here, to see
--
2.22.0
next prev parent reply other threads:[~2019-06-25 10:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 10:11 [PATCH RFC ipsec-next 0/7] ipsec: add TCP encapsulation support (RFC 8229) Sabrina Dubroca
2019-06-25 10:11 ` [PATCH RFC ipsec-next 1/7] net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram Sabrina Dubroca
2019-06-25 10:11 ` [PATCH RFC ipsec-next 2/7] skbuff: Avoid sleeping in skb_send_sock_locked Sabrina Dubroca
2019-06-25 10:11 ` [PATCH RFC ipsec-next 3/7] xfrm: introduce xfrm_trans_queue_net Sabrina Dubroca
2019-06-25 10:11 ` [PATCH RFC ipsec-next 4/7] xfrm: add route lookup to xfrm4_rcv_encap Sabrina Dubroca
2019-06-25 10:11 ` Sabrina Dubroca [this message]
2019-06-25 10:11 ` [PATCH RFC ipsec-next 6/7] esp4: split esp_output_udp_encap and introduce esp_output_encap Sabrina Dubroca
2019-06-25 10:11 ` [PATCH RFC ipsec-next 7/7] xfrm: add espintcp (RFC 8229) Sabrina Dubroca
2019-08-16 14:18 ` [PATCH RFC ipsec-next 0/7] ipsec: add TCP encapsulation support " Sabrina Dubroca
2019-08-21 6:59 ` Steffen Klassert
2019-08-21 10:17 ` Sabrina Dubroca
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=14a335c24a30eb7772066d6b30be57972c47a977.1561457281.git.sd@queasysnail.net \
--to=sd@queasysnail.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/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).