From nobody Sun May 5 11:06:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1677123jad; Thu, 24 Feb 2022 07:50:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmvfTBE98Pnodjem14/lmMG60f+Soo96kRBQHtUpbgn/1kgXZ7pT72VdpqCgEjsQQDEAx8 X-Received: by 2002:a65:4c0f:0:b0:373:f389:b7e0 with SMTP id u15-20020a654c0f000000b00373f389b7e0mr2659321pgq.411.1645717830834; Thu, 24 Feb 2022 07:50:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645717830; cv=none; d=google.com; s=arc-20160816; b=kjgRihW4ex5aAA9rUtX2DgYEp0ZJgqGBYAuKGjifGXZUYvs4WwEO4L6xAd3Iz5FXWt EAYPbhyCARKCUYR4r4llIAcYuZxxfuGbiHEuEPaazMe9QhhO1b3ziJLGIjhP+XuKzWFZ 1LAnSyNFZoF01lBFAbjtrC9Nq1J7XoWVldf3ADSwISCTbUdh3LnDk36JiYqmkEo53Sv3 jqsx4g0pzgza0RR2OtVhjPri1dAq2wDo+MLr9xdGjbseCxEwQaGarjnVw5SHHqxXJlmA s+ItVxJKpajSm1ayLKQKJF01tW2v/ai0Xz6e01C1wlGJH4t8PMokzwHl+noq5BaQ+H/t Op+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Lj7v8n8CPI7ivzsWE4FHldpwlxQd/NVTJ2Urefl9AGA=; b=mkd9tTfg0ckfQFYoVNe5qt1HxSMwq6x6kmy23lsafU7rGf8o79Xj62alGw0L/f2nnE onTDVSyAZ0GqcgzfFZLyu2/2xWQsTwpiO4oxBufn6E4PnFTXK5scmqglmzpi6rkiTwSZ brM6bZfZBZdYv7XKl3q+4Wi9eOJgQPf9sO4XCLSlraMq44ROj/k2I36YOZv8b+4YhPjM g/kx2QbXU7Wa8hQfgwQ9bp436X0KEtYGP2xRc0c31R/jMRKoMXABvz7HSSbVGom+u1IT d667OfE+hBKWVdLh+44o2rsvaofmfJK+14LIg2SRPwuUdPFXQwFoI5mSfc8wmqFb7OSL 7VVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4007-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4007-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id f4si2442185plr.596.2022.02.24.07.50.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Feb 2022 07:50:30 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4007-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4007-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4007-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 0FA873E0FB0 for ; Thu, 24 Feb 2022 15:50:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0022D748C; Thu, 24 Feb 2022 15:50:29 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87FCF7A for ; Thu, 24 Feb 2022 15:50:27 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nNGNn-0005Iz-Hs; Thu, 24 Feb 2022 16:50:19 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next 1/4] mptcp: prefer ip address in syn skb instead of listen sk bound address Date: Thu, 24 Feb 2022 16:50:07 +0100 Message-Id: <20220224155010.23676-2-fw@strlen.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220224155010.23676-1-fw@strlen.de> References: <20220224155010.23676-1-fw@strlen.de> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Once we change mptcp to use tproxy-like scheme to steer mptcp join requests to a special pernet socket, the 'sk bound address' becomes meaningless because it will never be identical to the tcp dport/ip daddr of the on-wire packet. Prepare for this: pass the skbuff and use the packet data instead of the address the listener socket is bound to. Signed-off-by: Florian Westphal --- net/mptcp/pm_netlink.c | 17 +++++++++++++++-- net/mptcp/protocol.h | 2 +- net/mptcp/subflow.c | 5 +++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e3b0384ff79a..dcbc11d6b767 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -269,13 +269,26 @@ mptcp_lookup_anno_list_by_saddr(const struct mptcp_so= ck *msk, return NULL; } =20 -bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk) +static void skb_fetch_src_address(const struct sk_buff *skb, + struct mptcp_addr_info *addr) +{ + addr->port =3D tcp_hdr(skb)->dest; + if (addr->family =3D=3D AF_INET) + addr->addr.s_addr =3D ip_hdr(skb)->daddr; +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + else if (addr->family =3D=3D AF_INET6) + addr->addr6 =3D ipv6_hdr(skb)->daddr; +#endif +} + +bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, int af, const str= uct sk_buff *skb) { struct mptcp_pm_add_entry *entry; struct mptcp_addr_info saddr; bool ret =3D false; =20 - local_address((struct sock_common *)sk, &saddr); + saddr.family =3D af; + skb_fetch_src_address(skb, &saddr); =20 spin_lock_bh(&msk->pm.lock); list_for_each_entry(entry, &msk->pm.anno_list, list) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c8bada4537e2..6b2d7f60c8ad 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -761,7 +761,7 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup); void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); -bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk); +bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, int af, const str= uct sk_buff *skb); struct mptcp_pm_add_entry * mptcp_pm_del_add_timer(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool check_id); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 30ffb00661bb..77da5f744a17 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -216,7 +216,8 @@ static int subflow_check_req(struct request_sock *req, pr_debug("syn inet_sport=3D%d %d", ntohs(inet_sk(sk_listener)->inet_sport), ntohs(inet_sk((struct sock *)subflow_req->msk)->inet_sport)); - if (!mptcp_pm_sport_in_anno_list(subflow_req->msk, sk_listener)) { + if (!mptcp_pm_sport_in_anno_list(subflow_req->msk, + sk_listener->sk_family, skb)) { SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTSYNRX); return -EPERM; } @@ -793,7 +794,7 @@ static struct sock *subflow_syn_recv_sock(const struct = sock *sk, pr_debug("ack inet_sport=3D%d %d", ntohs(inet_sk(sk)->inet_sport), ntohs(inet_sk((struct sock *)owner)->inet_sport)); - if (!mptcp_pm_sport_in_anno_list(owner, sk)) { + if (!mptcp_pm_sport_in_anno_list(owner, sk->sk_family, skb)) { SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTACKRX); goto dispose_child; } --=20 2.34.1 From nobody Sun May 5 11:06:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1677102jad; Thu, 24 Feb 2022 07:50:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJx61uRwXvAMaGrM8FxGZNOSy/boXZYta0FXh885074AHL49E666cGZrKlHtfaWK21Dw9mhH X-Received: by 2002:a65:5842:0:b0:374:58b8:2563 with SMTP id s2-20020a655842000000b0037458b82563mr2737403pgr.52.1645717828714; Thu, 24 Feb 2022 07:50:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645717828; cv=none; d=google.com; s=arc-20160816; b=xQzREX0V8g8YdiQxeVALD/dEy1i9pe0ghjvfop7WL1IOh1LO+R/W1yEfUSrDBzoFXX Bn6OJ1uZxCFCsBq0+IKjMmZIt0mmImA2uCnSWY6aVvTV8ZgXmhmGebLl+meOyFPxNMGG LUYUEtv0KXi/dtbgLGT6vDqoQD0fWkq9Xh1y2snuy3vFeReKfQQcsBOKvZ22nAslzltC Hf0gzQPEQqXu6yDOJ27Ic4FYtkAh4dESse35y8iv17qdQjjzFcqposDy9/JRMTFP1Ne7 tKdL0sG+9IXsMPYbpMFJtovvMsb/FRU699NeRzkvuk48CxXzZ2XFgaYymdd/ZpML/BEo vGpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=yliBVYMBkNDxNEMB4A+g8NcCxKaVdsjv1Sisf2ohydE=; b=cv6EDnys/Bwu71Um72vvToLA1CO1AuRFOV/bWDtJWcEl9e2913WLWajPGNiJtecrfo dCIDzj8P9CQl8PM0xbdIFoNq3rB0KDSwH6/cuKaPA0JxBPFUXpD3FvTsclSTELwcMMns tZ3bnBMSg8ZK/hlSkF7Ny75w0ZdP+JAd6WpJDPV6XuOSn4cPBf2YX7TB9AyfZ5vTScJd MJ7ePz1cJijbwvUADwWdUQ+oSnM4NdMSDWRulOl/RN27TV0GdUMKcHzeITtrezpt6uU8 UWeOljVCECx6zi6s/sYsSQWi1tzGtBoec0eh51ykT+n9E4YkcK2d/Goa3+w7e2872CUR Bcaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4006-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4006-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id y64si2764954pgd.327.2022.02.24.07.50.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Feb 2022 07:50:28 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4006-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4006-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4006-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 02F933E0FB0 for ; Thu, 24 Feb 2022 15:50:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25D61748C; Thu, 24 Feb 2022 15:50:27 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C219E7A for ; Thu, 24 Feb 2022 15:50:25 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nNGNr-0005J7-Na; Thu, 24 Feb 2022 16:50:23 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next 2/4] tcp: add mptcp join demultiplex hooks Date: Thu, 24 Feb 2022 16:50:08 +0100 Message-Id: <20220224155010.23676-3-fw@strlen.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220224155010.23676-1-fw@strlen.de> References: <20220224155010.23676-1-fw@strlen.de> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Split from the next patch to make core tcp changes more obvious: add a dummy function that gets called after tcp socket demux came up empty. This will be used by mptcp to check if a tcp syn contains an mptcp join option with a valid token (connection id). If so, a hidden pernet mptcp listener socket is returned and packet resumes normally. Signed-off-by: Florian Westphal --- include/net/mptcp.h | 12 ++++++++++++ net/ipv4/tcp_ipv4.c | 7 +++++++ net/ipv6/tcp_ipv6.c | 7 +++++++ 3 files changed, 26 insertions(+) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 8b1afd6f5cc4..b914e63afc13 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -197,6 +197,11 @@ static inline __be32 mptcp_reset_option(const struct s= k_buff *skb) =20 return htonl(0u); } + +static inline struct sock *mptcp_handle_join4(struct sk_buff *skb) +{ + return NULL; +} #else =20 static inline void mptcp_init(void) @@ -274,14 +279,21 @@ static inline int mptcp_subflow_init_cookie_req(struc= t request_sock *req, } =20 static inline __be32 mptcp_reset_option(const struct sk_buff *skb) { retu= rn htonl(0u); } +static inline struct sock *mptcp_handle_join4(struct sk_buff *skb) { retur= n NULL; } #endif /* CONFIG_MPTCP */ =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) int mptcpv6_init(void); void mptcpv6_handle_mapped(struct sock *sk, bool mapped); + +static inline struct sock *mptcp_handle_join6(struct sk_buff *skb) +{ + return NULL; +} #elif IS_ENABLED(CONFIG_IPV6) static inline int mptcpv6_init(void) { return 0; } static inline void mptcpv6_handle_mapped(struct sock *sk, bool mapped) { } +static inline struct sock *mptcp_handle_join6(struct sk_buff *skb) { retur= n NULL; } #endif =20 #endif /* __NET_MPTCP_H */ diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index d42824aedc36..feb779d1fd21 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2155,6 +2155,10 @@ int tcp_v4_rcv(struct sk_buff *skb) if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) goto discard_it; =20 + sk =3D mptcp_handle_join4(skb); + if (sk) + goto process; + tcp_v4_fill_cb(skb, iph, th); =20 if (tcp_checksum_complete(skb)) { @@ -2201,6 +2205,9 @@ int tcp_v4_rcv(struct sk_buff *skb) iph->daddr, th->dest, inet_iif(skb), sdif); + if (!sk2) + sk2 =3D mptcp_handle_join4(skb); + if (sk2) { inet_twsk_deschedule_put(inet_twsk(sk)); sk =3D sk2; diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 749de8529c83..2f7a621aa24d 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1800,6 +1800,10 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buf= f *skb) if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) goto discard_it; =20 + sk =3D mptcp_handle_join6(skb); + if (sk) + goto process; + tcp_v6_fill_cb(skb, hdr, th); =20 if (tcp_checksum_complete(skb)) { @@ -1849,6 +1853,9 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff= *skb) ntohs(th->dest), tcp_v6_iif_l3_slave(skb), sdif); + if (!sk2) + sk2 =3D mptcp_handle_join6(skb); + if (sk2) { struct inet_timewait_sock *tw =3D inet_twsk(sk); inet_twsk_deschedule_put(tw); --=20 2.34.1 From nobody Sun May 5 11:06:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1677161jad; Thu, 24 Feb 2022 07:50:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5CjqUpPwyg0BiwYHqsOreAKFLIvil11d2o+TPLj3h50GGDXNDUkhS8agmQE5EILlX638F X-Received: by 2002:a05:6a00:1910:b0:4f3:aa39:1e17 with SMTP id y16-20020a056a00191000b004f3aa391e17mr3464048pfi.54.1645717833172; Thu, 24 Feb 2022 07:50:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645717833; cv=none; d=google.com; s=arc-20160816; b=nevqblDLl9pAuaFLjCUFUcCPLINGQbditNvCNlt/sKqYAcyvyYw0JdgTQ/IrI3uLm6 KJ+cep1iO1QB/ExVYVAU/onLatTQE3rOWQFa5u2jLBbs9eL+m8quOmhFiZOhNN/iSdgF cH3z+8CN7M0Fb4u9pF9iK1aKAD+f3/KpcIt1G/SlnRQfEAgnAZGZSujBiyr6ErZZfZ5h hu3bqXriWofhhFrCkwqOuzUjN4XvgBXo/SyR3/X7jzGSa2QVh9l3EbJBgiriv6IayaXT xqZHvtsBhhMn/FkOioX61Q/RYWvec+9L9c4fFbCNPEa6IKQRp0yYeoVMaVUB6POVfkpi d3Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=AXhI+uJXrdktai8c3BvPmwCs4sgaGmz8HvgRukGBZbM=; b=ODhm6Hp/eo9JDJi7BBW9qUB3DsNqpnjrrQdMXh6E38sFzQPUiFBz35rEWcoxv+SMys 064MPloqwTFkb3x1QnW//8jcJ0XAP2mutOvQGxzJmSVFb25M00TusXve/f5rDjnBsSxb iVnpE4r9eR7ZLM5ZJ/9XZlcK4mCXhWE4SgrAd01zJGTyBrnrqwW8ClOfqcS7z74mr6DR e7CwDu4aOQL7v52evABU4K2uqIB+5AnZFjzLQFf2N1bBuLwqJquWowzLOY642G+/gOYr ffXJFK14EhT2NpD/bGdY90lFED10h4O8Aa4zf1Zuhol0LSq5hv42V4aXIdp9Pne78nQ0 qTdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4008-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4008-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id 131si2500559pgh.546.2022.02.24.07.50.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Feb 2022 07:50:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4008-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4008-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4008-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 722443E1002 for ; Thu, 24 Feb 2022 15:50:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 843B6748C; Thu, 24 Feb 2022 15:50:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAB177A for ; Thu, 24 Feb 2022 15:50:29 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nNGNv-0005JI-SN; Thu, 24 Feb 2022 16:50:27 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next 3/4] mptcp: handle join requests via pernet listen socket Date: Thu, 24 Feb 2022 16:50:09 +0100 Message-Id: <20220224155010.23676-4-fw@strlen.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220224155010.23676-1-fw@strlen.de> References: <20220224155010.23676-1-fw@strlen.de> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently mptcp adds kernel-based listener socket for all netlink-configured mptcp address endpoints. This has caveats because kernel may interfere with unrelated programs that use same address/port pairs. RFC 8684 says: Demultiplexing subflow SYNs MUST be done using the token; this is unlike traditional TCP, where the destination port is used for demultiplexing SYN packets. Once a subflow is set up, demultiplexing packets is done using the 5-tuple, as in traditional TCP. This patch deviates from this in that it retains the existing checks of verifying the incoming requests destination vs. the list of announced addresses. If the request is to an address that was not assigned, its treated like an invalid token, i.e. we send a tcp reset with mptcp error specific code is returned. The checks that do this are moved from subflow specific code to the new hook, this allows us to perform the check at an earlier stage. Furthermore, TCP-only listeners take precedence: An MPTCP peer MUST NOT announce addr:port pairs that are already in use by a non-mptcp listener. This could be changed, but it requires move of mptcp_handle_join() hook *before* the tcp port demux, i.e. an additional conditional in hotpath. As-is, the additional conditional (syn && !rst && ...) is placed in the 'no socket found' path. The pernet "listening" socket is hidden from userspace, its not part of any hashes and not bound to any address/port. TPROXY-like semantics apply: If tcp demux cannot find a port for a given packet, check if the packet is a syn packet with a valid join token. If so, the pernet listener is returned and tcp processing resumes. Otherwise, handling is identical. Signed-off-by: Florian Westphal --- include/net/mptcp.h | 19 +++- net/ipv6/tcp_ipv6.c | 19 ++-- net/mptcp/ctrl.c | 229 ++++++++++++++++++++++++++++++++++++++++++- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 2 +- net/mptcp/subflow.c | 8 +- 6 files changed, 258 insertions(+), 21 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index b914e63afc13..b8939d7ea12e 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -189,6 +189,7 @@ int mptcp_subflow_init_cookie_req(struct request_sock *= req, struct sk_buff *skb); =20 __be32 mptcp_get_reset_option(const struct sk_buff *skb); +struct sock *__mptcp_handle_join(int af, struct sk_buff *skb); =20 static inline __be32 mptcp_reset_option(const struct sk_buff *skb) { @@ -198,10 +199,20 @@ static inline __be32 mptcp_reset_option(const struct = sk_buff *skb) return htonl(0u); } =20 -static inline struct sock *mptcp_handle_join4(struct sk_buff *skb) +static inline struct sock *mptcp_handle_join(struct sk_buff *skb, int af) { + const struct tcphdr *th =3D tcp_hdr(skb); + + if (th->syn && !th->ack && !th->rst && !th->fin) + return __mptcp_handle_join(af, skb); + return NULL; } + +static inline struct sock *mptcp_handle_join4(struct sk_buff *skb) +{ + return mptcp_handle_join(skb, AF_INET); +} #else =20 static inline void mptcp_init(void) @@ -284,14 +295,18 @@ static inline struct sock *mptcp_handle_join4(struct = sk_buff *skb) { return NULL =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) int mptcpv6_init(void); +int mptcpv6_init_net(struct net *net); +void mptcpv6_exit_net(struct net *net); void mptcpv6_handle_mapped(struct sock *sk, bool mapped); =20 static inline struct sock *mptcp_handle_join6(struct sk_buff *skb) { - return NULL; + return mptcp_handle_join(skb, AF_INET6); } #elif IS_ENABLED(CONFIG_IPV6) static inline int mptcpv6_init(void) { return 0; } +static inline int mptcpv6_init_net(struct net *net) { return 0; } +static inline void mptcpv6_exit_net(struct net *net) { } static inline void mptcpv6_handle_mapped(struct sock *sk, bool mapped) { } static inline struct sock *mptcp_handle_join6(struct sk_buff *skb) { retur= n NULL; } #endif diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 2f7a621aa24d..b414e2f77fa3 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -2256,13 +2256,22 @@ static struct inet_protosw tcpv6_protosw =3D { =20 static int __net_init tcpv6_net_init(struct net *net) { - return inet_ctl_sock_create(&net->ipv6.tcp_sk, PF_INET6, - SOCK_RAW, IPPROTO_TCP, net); + int err =3D inet_ctl_sock_create(&net->ipv6.tcp_sk, PF_INET6, + SOCK_RAW, IPPROTO_TCP, net); + if (err) + return err; + + err =3D mptcpv6_init_net(net); + if (err) + inet_ctl_sock_destroy(net->ipv6.tcp_sk); + + return err; } =20 static void __net_exit tcpv6_net_exit(struct net *net) { inet_ctl_sock_destroy(net->ipv6.tcp_sk); + mptcpv6_exit_net(net); } =20 static struct pernet_operations tcpv6_net_ops =3D { @@ -2287,15 +2296,9 @@ int __init tcpv6_init(void) if (ret) goto out_tcpv6_protosw; =20 - ret =3D mptcpv6_init(); - if (ret) - goto out_tcpv6_pernet_subsys; - out: return ret; =20 -out_tcpv6_pernet_subsys: - unregister_pernet_subsys(&tcpv6_net_ops); out_tcpv6_protosw: inet6_unregister_protosw(&tcpv6_protosw); out_tcpv6_protocol: diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index ae20b7d92e28..c7370c5147df 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -12,6 +12,7 @@ #include =20 #include "protocol.h" +#include "mib.h" =20 #define MPTCP_SYSCTL_PATH "net/mptcp" =20 @@ -21,6 +22,12 @@ static int mptcp_pernet_id; static int mptcp_pm_type_max =3D __MPTCP_PM_TYPE_MAX; #endif =20 +struct mptcp_join_sk { + struct sock *sk; + struct inet_bind_bucket *tb; + struct inet_bind_hashbucket head; +}; + struct mptcp_pernet { #ifdef CONFIG_SYSCTL struct ctl_table_header *ctl_table_hdr; @@ -32,6 +39,18 @@ struct mptcp_pernet { u8 checksum_enabled; u8 allow_join_initial_addr_port; u8 pm_type; + + /* pernet listener to handle mptcp join requests + * based on the mptcp token. + * + * Has to be pernet because tcp uses + * sock_net(sk_listener) to obtain the net namespace for + * the syn/ack route lookup. + */ + struct mptcp_join_sk join4; +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + struct mptcp_join_sk join6; +#endif }; =20 static struct mptcp_pernet *mptcp_get_pernet(const struct net *net) @@ -185,13 +204,190 @@ static void mptcp_pernet_del_table(struct mptcp_pern= et *pernet) {} =20 #endif /* CONFIG_SYSCTL */ =20 +static void add_mptcp_rst(struct sk_buff *skb) +{ + struct mptcp_ext *ext =3D skb_ext_add(skb, SKB_EXT_MPTCP); + + if (ext) { + memset(ext, 0, sizeof(*ext)); + ext->reset_reason =3D MPTCP_RST_EMPTCP; + } +} + +struct sock *__mptcp_handle_join(int af, struct sk_buff *skb) +{ + struct mptcp_options_received mp_opt; + struct mptcp_pernet *pernet; + struct mptcp_sock *msk; + struct socket *ssock; + struct sock *lsk; + struct net *net; + + /* paranoia check: don't allow 0 destination port, + * else __inet_inherit_port will insert the child socket + * into the phony hash slot of the pernet listener. + */ + if (tcp_hdr(skb)->dest =3D=3D 0) + return NULL; + + mptcp_get_options(skb, &mp_opt); + + if (!(mp_opt.suboptions & OPTIONS_MPTCP_MPJ)) + return NULL; + + net =3D dev_net(skb_dst(skb)->dev); + if (!mptcp_is_enabled(net)) + return NULL; + + /* RFC8684: If the token is unknown [..], the receiver will send + * back a reset (RST) signal, analogous to an unknown port in TCP, + * containing an MP_TCPRST option (Section 3.6) [..] + */ + msk =3D mptcp_token_get_sock(net, mp_opt.token); + if (!msk) { + add_mptcp_rst(skb); + return NULL; + } + + if (!mptcp_pm_sport_in_anno_list(msk, af, skb)) { + sock_put((struct sock *)msk); + MPTCP_INC_STATS(net, MPTCP_MIB_MISMATCHPORTSYNRX); + add_mptcp_rst(skb); + return NULL; + } + + sock_put((struct sock *)msk); + pernet =3D mptcp_get_pernet(net); + + switch (af) { + case AF_INET: + lsk =3D pernet->join4.sk; + break; +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + case AF_INET6: + lsk =3D pernet->join6.sk; + break; +#endif + default: + WARN_ON_ONCE(1); + return NULL; + } + + ssock =3D __mptcp_nmpc_socket(mptcp_sk(lsk)); + if (WARN_ON(!ssock)) + return NULL; + + return ssock->sk; +} + +static struct socket *mptcp_create_join_listen_socket(struct net *net, int= af) +{ + struct socket *s, *ssock; + int err; + + err =3D sock_create_kern(net, af, SOCK_STREAM, IPPROTO_MPTCP, &s); + if (err) + return ERR_PTR(err); + + ssock =3D __mptcp_nmpc_socket(mptcp_sk(s->sk)); + if (!ssock) { + err =3D -EINVAL; + goto out; + } + + ssock->sk->sk_max_ack_backlog =3D SOMAXCONN; + inet_sk_state_store(ssock->sk, TCP_LISTEN); + + s->sk->sk_max_ack_backlog =3D SOMAXCONN; + inet_sk_state_store(s->sk, TCP_LISTEN); + + s->sk->sk_net_refcnt =3D 1; + get_net_track(net, &s->sk->ns_tracker, GFP_KERNEL); + sock_inuse_add(net, 1); + + return s; +out: + sock_release(s); + return ERR_PTR(err); +} + +static int mptcp_init_join_sk(struct net *net, struct sock *sk, struct mpt= cp_join_sk *join_sk) +{ + struct socket *ssock =3D __mptcp_nmpc_socket(mptcp_sk(sk)); + struct inet_hashinfo *table =3D ssock->sk->sk_prot->h.hashinfo; + struct inet_bind_bucket *tb; + + spin_lock_init(&join_sk->head.lock); + INIT_HLIST_HEAD(&join_sk->head.chain); + + /* Our "listen socket" isn't bound to any address or port. + * Conceptually, SYN packet with mptcp join request are steered to + * this pernet socket just like TPROXY steals arbitrary connection + * requests to assign them to listening socket with different + * address or port. + * + * The bind_bucket is needed for sake of __inet_inherit_port(), + * so it can place the new child socket in the correct + * bind_bucket slot. + * + * A phony head is used to hide this socket from normal sk loookup. + */ + tb =3D inet_bind_bucket_create(table->bind_bucket_cachep, + net, &join_sk->head, 0, 0); + if (!tb) + return -ENOMEM; + + inet_csk(ssock->sk)->icsk_bind_hash =3D tb; + return 0; +} + static int __net_init mptcp_net_init(struct net *net) { struct mptcp_pernet *pernet =3D mptcp_get_pernet(net); + struct socket *sock; + int err; =20 mptcp_pernet_set_defaults(pernet); =20 - return mptcp_pernet_new_table(net, pernet); + err =3D mptcp_pernet_new_table(net, pernet); + if (err) + return err; + + sock =3D mptcp_create_join_listen_socket(net, AF_INET); + if (IS_ERR(sock)) { + err =3D PTR_ERR(sock); + goto out_table; + } + + err =3D mptcp_init_join_sk(net, sock->sk, &pernet->join4); + if (err) { + sock_release(sock); + goto out_table; + } + + /* struct sock is still reachable via sock->sk_socket backpointer */ + pernet->join4.sk =3D sock->sk; + return err; + +out_table: + if (!net_eq(net, &init_net)) + mptcp_pernet_del_table(pernet); + return err; +} + +static void __net_exit mptcp_exit_join_sk(struct mptcp_join_sk *jsk) +{ + struct socket *ssock =3D __mptcp_nmpc_socket(mptcp_sk(jsk->sk)); + struct inet_bind_bucket *tb; + struct inet_hashinfo *table; + + table =3D ssock->sk->sk_prot->h.hashinfo; + + tb =3D inet_csk(ssock->sk)->icsk_bind_hash; + inet_bind_bucket_destroy(table->bind_bucket_cachep, tb); + + ssock =3D jsk->sk->sk_socket; + sock_release(ssock); } =20 /* Note: the callback will only be called per extra netns */ @@ -200,6 +396,7 @@ static void __net_exit mptcp_net_exit(struct net *net) struct mptcp_pernet *pernet =3D mptcp_get_pernet(net); =20 mptcp_pernet_del_table(pernet); + mptcp_exit_join_sk(&pernet->join4); } =20 static struct pernet_operations mptcp_pernet_ops =3D { @@ -219,12 +416,36 @@ void __init mptcp_init(void) } =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) -int __init mptcpv6_init(void) +int __net_init mptcpv6_init_net(struct net *net) { + struct mptcp_pernet *pernet =3D mptcp_get_pernet(net); + struct socket *sock; int err; =20 - err =3D mptcp_proto_v6_init(); + if (net_eq(net, &init_net)) { + err =3D mptcp_proto_v6_init(); + if (err) + return err; + } + + sock =3D mptcp_create_join_listen_socket(net, AF_INET6); + if (IS_ERR(sock)) + return PTR_ERR(sock); =20 - return err; + err =3D mptcp_init_join_sk(net, sock->sk, &pernet->join6); + if (err) { + sock_release(sock); + return err; + } + + pernet->join6.sk =3D sock->sk; + return 0; +} + +void __net_exit mptcpv6_exit_net(struct net *net) +{ + struct mptcp_pernet *pernet =3D mptcp_get_pernet(net); + + mptcp_exit_join_sk(&pernet->join6); } #endif diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3cb975227d12..bc7108ed453c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3794,7 +3794,7 @@ static struct inet_protosw mptcp_v6_protosw =3D { .flags =3D INET_PROTOSW_ICSK, }; =20 -int __init mptcp_proto_v6_init(void) +int __net_init mptcp_proto_v6_init(void) { int err; =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 6b2d7f60c8ad..7ec2513e1c2f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -648,7 +648,7 @@ static inline bool mptcp_has_another_subflow(struct soc= k *ssk) =20 void __init mptcp_proto_init(void); #if IS_ENABLED(CONFIG_MPTCP_IPV6) -int __init mptcp_proto_v6_init(void); +int __net_init mptcp_proto_v6_init(void); #endif =20 struct sock *mptcp_sk_clone(const struct sock *sk, diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 77da5f744a17..67a4c698602d 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -116,6 +116,9 @@ static void subflow_init_req(struct request_sock *req, = const struct sock *sk_lis =20 static bool subflow_use_different_sport(struct mptcp_sock *msk, const stru= ct sock *sk) { + if (inet_sk(sk)->inet_sport =3D=3D 0) + return true; + return inet_sk(sk)->inet_sport !=3D inet_sk((struct sock *)msk)->inet_spo= rt; } =20 @@ -216,11 +219,6 @@ static int subflow_check_req(struct request_sock *req, pr_debug("syn inet_sport=3D%d %d", ntohs(inet_sk(sk_listener)->inet_sport), ntohs(inet_sk((struct sock *)subflow_req->msk)->inet_sport)); - if (!mptcp_pm_sport_in_anno_list(subflow_req->msk, - sk_listener->sk_family, skb)) { - SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTSYNRX); - return -EPERM; - } SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINPORTSYNRX); } =20 --=20 2.34.1 From nobody Sun May 5 11:06:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1677235jad; Thu, 24 Feb 2022 07:50:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJy6fFxRiOfIhhLevAB+ax/z/Ti7AtRI1TR6Vxqweb5jxh3XsEMlvTP939v3r4JVww8FBIEC X-Received: by 2002:a05:6402:2298:b0:410:a419:997 with SMTP id cw24-20020a056402229800b00410a4190997mr2978867edb.271.1645717838524; Thu, 24 Feb 2022 07:50:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645717838; cv=none; d=google.com; s=arc-20160816; b=rPH4h4sE6JWWXt55RlyFpJWvmlBgCPFdAx/mIMOYiAUq02ePBi3qzT/jq4U8P1PDYU 2VTPMieL8D9NR4HroSFG0XTNZR9AhQ1Q8EPDg5ywjylaQ320REIg1Vg4EJ78Qf2xZ4fh sLowAfxxwyjGL/mj/iPk0E5J32vduQpAbppBncNs8aOibJ+BzMWN+GpjgFkn7C+KNob8 /p0mRN0a+kS/icQBErT0zuClu1zPlL6+PLzp4lISZ35d4ofBmNQDMtf41ZJITHi2zleN Rf+1iGUlYudGMoZlxvQ8psp+pR310pfXylQ//1W5FgfIgJAe9QEYVpIhvENTq/eikv3h zZuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=XGoysPtl+u28vN+Wr8RWp1WJ3FovV5ZYJC+nDXwil/Q=; b=UGEyUodvJJhkZ9t8NTvP/cOkOyV7USR56n0A22hdYKJb55NzBvlW/XkaCFaXBPqStV Afn1yfRFgrKgoSZBs51QSCscNyWM9r9z3grbNGXTz+qOOesMoAIRUFoKyib5qA3zc7c/ GqZSE18OW99K9zAsEsReEVS3wpC/H/Y5Hn1qtBVLdBpvyotQN1dJoQ3/GVk0e+LURP8h TdRszUuD8/gSmpiqwwi5wvuVMIHBclTA2/dsg08hnE7IBEkidfWeoCFzLODv5MmvW9+L jlDJf3X9jXDuh+QR1jrFw0e9LcADd15ay/ov4VxP50FY5vy4WWzXiGbUEOfY828RuDgn Njag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4009-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4009-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id cw4si2097115ejc.967.2022.02.24.07.50.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Feb 2022 07:50:38 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4009-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4009-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4009-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id D2AF21C0E6C for ; Thu, 24 Feb 2022 15:50:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7CD86748C; Thu, 24 Feb 2022 15:50:35 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E6217A for ; Thu, 24 Feb 2022 15:50:34 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nNGO0-0005Jf-0j; Thu, 24 Feb 2022 16:50:32 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next 4/4] mptcp: remove per-address listening sockets Date: Thu, 24 Feb 2022 16:50:10 +0100 Message-Id: <20220224155010.23676-5-fw@strlen.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220224155010.23676-1-fw@strlen.de> References: <20220224155010.23676-1-fw@strlen.de> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Not required anymore, syn packets with a join requests are redirected to pernet mptcp pseudo-listening socket. Signed-off-by: Florian Westphal --- net/mptcp/pm_netlink.c | 65 ------------------------------------------ 1 file changed, 65 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index dcbc11d6b767..836326e04c4a 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -27,7 +27,6 @@ struct mptcp_pm_addr_entry { struct mptcp_addr_info addr; u8 flags; int ifindex; - struct socket *lsk; }; =20 struct mptcp_pm_add_entry { @@ -883,8 +882,6 @@ static bool address_use_port(struct mptcp_pm_addr_entry= *entry) /* caller must ensure the RCU grace period is already elapsed */ static void __mptcp_pm_release_addr_entry(struct mptcp_pm_addr_entry *entr= y) { - if (entry->lsk) - sock_release(entry->lsk); kfree(entry); } =20 @@ -972,57 +969,6 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm= _nl_pernet *pernet, return ret; } =20 -static int mptcp_pm_nl_create_listen_socket(struct sock *sk, - struct mptcp_pm_addr_entry *entry) -{ - int addrlen =3D sizeof(struct sockaddr_in); - struct sockaddr_storage addr; - struct mptcp_sock *msk; - struct socket *ssock; - int backlog =3D 1024; - int err; - - err =3D sock_create_kern(sock_net(sk), entry->addr.family, - SOCK_STREAM, IPPROTO_MPTCP, &entry->lsk); - if (err) - return err; - - msk =3D mptcp_sk(entry->lsk->sk); - if (!msk) { - err =3D -EINVAL; - goto out; - } - - ssock =3D __mptcp_nmpc_socket(msk); - if (!ssock) { - err =3D -EINVAL; - goto out; - } - - mptcp_info2sockaddr(&entry->addr, &addr, entry->addr.family); -#if IS_ENABLED(CONFIG_MPTCP_IPV6) - if (entry->addr.family =3D=3D AF_INET6) - addrlen =3D sizeof(struct sockaddr_in6); -#endif - err =3D kernel_bind(ssock, (struct sockaddr *)&addr, addrlen); - if (err) { - pr_warn("kernel_bind error, err=3D%d", err); - goto out; - } - - err =3D kernel_listen(ssock, backlog); - if (err) { - pr_warn("kernel_listen error, err=3D%d", err); - goto out; - } - - return 0; - -out: - sock_release(entry->lsk); - return err; -} - int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *s= kc) { struct mptcp_pm_addr_entry *entry; @@ -1065,7 +1011,6 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct sock_common *skc) entry->addr.port =3D 0; entry->ifindex =3D 0; entry->flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; - entry->lsk =3D NULL; ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); if (ret < 0) kfree(entry); @@ -1284,19 +1229,9 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb= , struct genl_info *info) } =20 *entry =3D addr; - if (entry->addr.port) { - ret =3D mptcp_pm_nl_create_listen_socket(skb->sk, entry); - if (ret) { - GENL_SET_ERR_MSG(info, "create listen socket error"); - kfree(entry); - return ret; - } - } ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); if (ret < 0) { GENL_SET_ERR_MSG(info, "too many addresses or duplicate one"); - if (entry->lsk) - sock_release(entry->lsk); kfree(entry); return ret; } --=20 2.34.1