mptcp: disable mptcp when md5sig is set
Subsystems (2)
Paolo Abeni
v2 cover mptcp: disable mptcp when md5sig is set
As per last public mtg discussion, md5sig will cause TCP option space exaustion. Without md5sig we can't exhaust the TCP option space.
This series explcitly disable MPTCP when md5sig is set, and cleanup later option len checks with the assumption that TCP option space exhaustion is not expected - add a single WARN_ON() for that.
v1 -> v2:
- fix a couple of typos in comment/commit messages
Paolo Abeni (4):
mptcp: move mp_capable initialization at subflow_init_req() start
mptcp: disable on req sk if MD5SIG is enabled
mptcp: warn once if exceeding tcp opt space for dss/mp_capable
mptcp: remove unneeded check in mptcp_established_options_mp()
net/mptcp/subflow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.21.0
Paolo Abeni
PATCH v2 1/4 mptcp: move mp_capable initialization at subflow_init_req() start
This will avoid moving the code in later patch and makes disabling with md5 easier
Squash-to: "mptcp: Create SUBFLOW socket for incoming connections"
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
--- net/mptcp/subflow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mptcp/subflow.c +2 -2
@@ -28,6 +28,8 @@ static void subflow_init_req(struct request_sock *req,memset (&rx_opt.mptcp,0 ,sizeof (rx_opt.mptcp));mptcp_get_options (skb, &rx_opt); + subflow_req->mp_capable =0 ; +if (rx_opt.mptcp.mp_capable && listener->request_mptcp) { subflow_req->mp_capable =1 ;if (rx_opt.mptcp.version >= listener->request_version)
@@ -35,8 +37,6 @@ static void subflow_init_req(struct request_sock *req,else subflow_req->version = rx_opt.mptcp.version; subflow_req->remote_key = rx_opt.mptcp.sndr_key; - }else { - subflow_req->mp_capable =0 ; } }
Signature · 1 line
2.21.0
Paolo Abeni
PATCH v2 2/4 mptcp: disable on req sk if MD5SIG is enabled
In reply to Paolo AbeniSquash-to: mptcp: Create SUBFLOW socket for incoming connections
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
v1 -> v2
- fix comment typo
--- net/mptcp/protocol.c | 8 ++++++++ net/mptcp/subflow.c | 8 ++++++++ 2 files changed, 16 insertions(+)
net/mptcp/protocol.c +8 -0
@@ -342,6 +342,14 @@ static int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr,if (IS_ERR (ssock))return PTR_ERR (ssock); +#ifdef CONFIG_TCP_MD5SIG +/* no MPTCP if MD5SIG is enabled on this socket or we may run out of +* TCP option space. +*/ +if (rcu_access_pointer (tcp_sk (ssock->sk)->md5sig_info)) +mptcp_subflow_ctx (ssock->sk)->request_mptcp =0 ; +#endif + err = ssock->ops->connect (ssock, uaddr, addr_len, flags);sock_put (ssock->sk);return err;
net/mptcp/subflow.c +8 -0
@@ -30,6 +30,14 @@ static void subflow_init_req(struct request_sock *req, subflow_req->mp_capable =0 ; +#ifdef CONFIG_TCP_MD5SIG +/* no MPTCP if MD5SIG is enabled on this socket or we may run out of +* TCP option space. +*/ +if (rcu_access_pointer (tcp_sk (sk_listener)->md5sig_info)) +return ; +#endif +if (rx_opt.mptcp.mp_capable && listener->request_mptcp) { subflow_req->mp_capable =1 ;if (rx_opt.mptcp.version >= listener->request_version)
Signature · 1 line
2.21.0
Paolo Abeni
PATCH v2 3/4 mptcp: warn once if exceeding tcp opt space for dss/mp_capable
In reply to Paolo Abenisince such options will always fit the tcp header, modulo bugs
Squash-to: "mptcp: Write MPTCP DSS headers to outgoing data packets"
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
v1 -> v2:
- fix typo in commit message
--- net/mptcp/options.c | 71 ++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 40 deletions(-)
net/mptcp/options.c +31 -40
@@ -200,7 +200,7 @@ static bool mptcp_established_options_mp(struct sock *sk, unsigned int *size, {struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); -if (!subflow->fourth_ack && remaining >=TCPOLEN_MPTCP_MPC_ACK ) { +if (!subflow->fourth_ack) { opts->suboptions =OPTION_MPTCP_MPC_ACK ; opts->sndr_key = subflow->local_key; opts->rcvr_key = subflow->remote_key;
@@ -220,6 +220,7 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, {unsigned int dss_size =0 ;struct mptcp_ext *mpext; +struct mptcp_sock *msk;unsigned int ack_size; mpext = skb ?mptcp_get_ext (skb) :NULL ;
@@ -229,15 +230,10 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, map_size =TCPOLEN_MPTCP_DSS_BASE +TCPOLEN_MPTCP_DSS_MAP64 ; -if (map_size <= remaining) { - remaining -= map_size; - dss_size = map_size; -if (mpext) - opts->ext_copy = *mpext; - }else { - opts->ext_copy.use_map =0 ; -WARN_ONCE (1 ,"MPTCP: Map dropped" ); - } + remaining -= map_size; + dss_size = map_size; +if (mpext) + opts->ext_copy = *mpext; } ack_size =TCPOLEN_MPTCP_DSS_ACK64 ;
@@ -246,29 +242,19 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,if (dss_size ==0 ) ack_size +=TCPOLEN_MPTCP_DSS_BASE ; -if (ack_size <= remaining) { -struct mptcp_sock *msk; - - dss_size += ack_size; - - msk =mptcp_sk (mptcp_subflow_ctx (sk)->conn); -if (msk) { - opts->ext_copy.data_ack = msk->ack_seq; - }else { -mptcp_crypto_key_sha1 (mptcp_subflow_ctx (sk)->remote_key, -NULL , &opts->ext_copy.data_ack); - opts->ext_copy.data_ack++; - } + dss_size += ack_size; - opts->ext_copy.ack64 =1 ; - opts->ext_copy.use_ack =1 ; + msk =mptcp_sk (mptcp_subflow_ctx (sk)->conn); +if (msk) { + opts->ext_copy.data_ack = msk->ack_seq; }else { - opts->ext_copy.use_ack =0 ; -WARN (1 ,"MPTCP: Ack dropped" ); +mptcp_crypto_key_sha1 (mptcp_subflow_ctx (sk)->remote_key, +NULL , &opts->ext_copy.data_ack); + opts->ext_copy.data_ack++; } -if (!dss_size) -return false; + opts->ext_copy.ack64 =1 ; + opts->ext_copy.use_ack =1 ; *size =ALIGN (dss_size,4 );return true;
@@ -279,22 +265,27 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, struct mptcp_out_options *opts) {unsigned int opt_size =0 ; +bool ret = true;if (!mptcp_subflow_ctx (sk)->mp_capable)return false; -if (mptcp_established_options_mp (sk, &opt_size, remaining, opts)) { - *size += opt_size; - remaining -= opt_size; -return true; - }else if (mptcp_established_options_dss (sk, skb, &opt_size, remaining, - opts)) { - *size += opt_size; - remaining -= opt_size; -return true; - } +if (mptcp_established_options_mp (sk, &opt_size, remaining, opts)) + ret = true; +else if (mptcp_established_options_dss (sk, skb, &opt_size, remaining, + opts)) + ret = true; -return false; +/* we reserved enough space for the above options, and exceeding the +* TCP option space would be fatal +*/ +if (WARN_ON_ONCE (opt_size > remaining)) +return false; + + *size += opt_size; + remaining -= opt_size; + +return ret; } bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
Signature · 1 line
2.21.0
Paolo Abeni
PATCH v2 4/4 mptcp: remove unneeded check in mptcp_established_options_mp()
In reply to Paolo Abeniwe now have centralized check in mptcp_established_options()
Squash-to: "mptcp: Add handling of outgoing MP_JOIN requests"
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
--- net/mptcp/options.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/mptcp/options.c +1 -2
@@ -371,8 +371,7 @@ static bool mptcp_established_options_mp(struct sock *sk, unsigned int *size,pr_debug ("subflow=%p, local_key=%llu, remote_key=%llu" , subflow, subflow->local_key, subflow->remote_key);return true; - }else if (subflow->mp_join && !subflow->fourth_ack && - remaining >=TCPOLEN_MPTCP_MPJ_ACK ) { + }else if (subflow->mp_join && !subflow->fourth_ack) { opts->suboptions =OPTION_MPTCP_MPJ_ACK ;memcpy (opts->hmac, subflow->hmac,MPTCPOPT_HMAC_LEN ); *size =TCPOLEN_MPTCP_MPJ_ACK ;
Signature · 1 line
2.21.0
Paolo Abeni
[MPTCP] Re: [PATCH v2 1/4 1/1] [1/4] mptcp: move mp_capable initialization at subflow_init_req() start
In reply to Paolo Abeniwhoops, again manual mangling of the patches on my side, sorry.
Only the dumb tag is affected, so the patch contents are OK, afaics.
/P