| Message ID | cover.1566395202.git.sd@queasysnail.net |
|---|---|
| Headers | show |
| Series | ipsec: add TCP encapsulation support (RFC 8229) | expand |
Hi! On Wed, 21 Aug 2019 23:46:18 +0200, Sabrina Dubroca wrote: > This patchset introduces support for TCP encapsulation of IKE and ESP > messages, as defined by RFC 8229 [0]. It is an evolution of what > Herbert Xu proposed in January 2018 [1] that addresses the main > criticism against it, by not interfering with the TCP implementation > at all. The networking stack now has infrastructure for this: TCP ULPs > and Stream Parsers. > [...] Thank you very much for the patchset. Where I live, a substantial amount of free and paid Wifi networks restrict UDP to port 53. TCP ports are usually unaffected by such restrictions. Running IKE/ESP over TCP is sometimes the only remaining option, and this patch makes that option available. > The main omission in this submission is IPv6 support. ESP > encapsulation over UDP with IPv6 is currently not supported in the > kernel either, as UDP encapsulation is aimed at NAT traversal, and NAT > is not frequently used with IPv6. Side note: The lack of support for ESP over UDP with IPv6 is the reason why third-party Android IPsec management apps (e.g. the strongswan app) can't connect to IPv6-only remote endpoints. AFAIK Android apps do not have permission to send ESP packets directly, whereas establishing TCP connections and sending UDP datagrams is permitted. But even without IPv6 support, this patch is a great step forward. Regards, Carl-Daniel
This patchset introduces support for TCP encapsulation of IKE and ESP messages, as defined by RFC 8229 [0]. It is an evolution of what Herbert Xu proposed in January 2018 [1] that addresses the main criticism against it, by not interfering with the TCP implementation at all. The networking stack now has infrastructure for this: TCP ULPs and Stream Parsers. The first patches are preparation and refactoring, and the final patch adds the feature. The main omission in this submission is IPv6 support. ESP encapsulation over UDP with IPv6 is currently not supported in the kernel either, as UDP encapsulation is aimed at NAT traversal, and NAT is not frequently used with IPv6. Some of the code is taken directly, or slightly modified, from Herbert Xu's original submission [1]. The ULP and strparser pieces are new. This work was presented and discussed at the IPsec workshop and netdev 0x13 conference [2] in Prague, last March. An equivalent of patch #1 (skbuff: Avoid sleeping in skb_send_sock_locked) is already present in other trees (but not ipsec-next) as commit bd95e678e0f6 ("bpf: sockmap, fix use after free from sleep in psock backlog workqueue"), I'm only including it here so that this patchset works correctly on top of ipsec-next/master. No changes in the patchset since the RFC. [0] https://tools.ietf.org/html/rfc8229 [1] https://patchwork.ozlabs.org/patch/859107/ [2] https://netdevconf.org/0x13/session.html?talk-ipsec-encap Herbert Xu (1): skbuff: Avoid sleeping in skb_send_sock_locked Sabrina Dubroca (6): net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram xfrm: introduce xfrm_trans_queue_net xfrm: add route lookup to xfrm4_rcv_encap esp4: prepare esp_input_done2 for non-UDP encapsulation esp4: split esp_output_udp_encap and introduce esp_output_encap xfrm: add espintcp (RFC 8229) include/linux/skbuff.h | 11 +- include/net/espintcp.h | 38 +++ include/net/xfrm.h | 4 + include/uapi/linux/udp.h | 1 + net/core/datagram.c | 26 +- net/core/skbuff.c | 1 + net/ipv4/esp4.c | 262 ++++++++++++++++++-- net/ipv4/udp.c | 3 +- net/ipv4/xfrm4_protocol.c | 9 + net/unix/af_unix.c | 7 +- net/xfrm/Kconfig | 9 + net/xfrm/Makefile | 1 + net/xfrm/espintcp.c | 505 ++++++++++++++++++++++++++++++++++++++ net/xfrm/xfrm_input.c | 21 +- net/xfrm/xfrm_policy.c | 7 + net/xfrm/xfrm_state.c | 3 + 16 files changed, 862 insertions(+), 46 deletions(-) create mode 100644 include/net/espintcp.h create mode 100644 net/xfrm/espintcp.c