Commit d8b59efa authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller

mptcp: init mptcp request socket earlier

The mptcp subflow route_req() callback performs the subflow
req initialization after the route_req() check. If the latter
fails, mptcp-specific bits of the current request sockets
are left uninitialized.

The above causes bad things at req socket disposal time, when
the mptcp resources are cleared.

This change addresses the issue by splitting subflow_init_req()
into the actual initialization and the mptcp-specific checks.
The initialization is moved before any possibly failing check.
Reported-by: default avatarChristoph Paasch <cpaasch@apple.com>
Fixes: 7ea851d1 ("tcp: merge 'init_req' and 'route_req' functions")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64b9cea7
...@@ -92,7 +92,7 @@ static struct mptcp_sock *subflow_token_join_request(struct request_sock *req, ...@@ -92,7 +92,7 @@ static struct mptcp_sock *subflow_token_join_request(struct request_sock *req,
return msk; return msk;
} }
static int __subflow_init_req(struct request_sock *req, const struct sock *sk_listener) static void subflow_init_req(struct request_sock *req, const struct sock *sk_listener)
{ {
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req); struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
...@@ -100,16 +100,6 @@ static int __subflow_init_req(struct request_sock *req, const struct sock *sk_li ...@@ -100,16 +100,6 @@ static int __subflow_init_req(struct request_sock *req, const struct sock *sk_li
subflow_req->mp_join = 0; subflow_req->mp_join = 0;
subflow_req->msk = NULL; subflow_req->msk = NULL;
mptcp_token_init_request(req); mptcp_token_init_request(req);
#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 -EINVAL;
#endif
return 0;
} }
/* Init mptcp request socket. /* Init mptcp request socket.
...@@ -117,20 +107,23 @@ static int __subflow_init_req(struct request_sock *req, const struct sock *sk_li ...@@ -117,20 +107,23 @@ static int __subflow_init_req(struct request_sock *req, const struct sock *sk_li
* Returns an error code if a JOIN has failed and a TCP reset * Returns an error code if a JOIN has failed and a TCP reset
* should be sent. * should be sent.
*/ */
static int subflow_init_req(struct request_sock *req, static int subflow_check_req(struct request_sock *req,
const struct sock *sk_listener, const struct sock *sk_listener,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct mptcp_subflow_context *listener = mptcp_subflow_ctx(sk_listener); struct mptcp_subflow_context *listener = mptcp_subflow_ctx(sk_listener);
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req); struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
struct mptcp_options_received mp_opt; struct mptcp_options_received mp_opt;
int ret;
pr_debug("subflow_req=%p, listener=%p", subflow_req, listener); pr_debug("subflow_req=%p, listener=%p", subflow_req, listener);
ret = __subflow_init_req(req, sk_listener); #ifdef CONFIG_TCP_MD5SIG
if (ret) /* no MPTCP if MD5SIG is enabled on this socket or we may run out of
return 0; * TCP option space.
*/
if (rcu_access_pointer(tcp_sk(sk_listener)->md5sig_info))
return -EINVAL;
#endif
mptcp_get_options(skb, &mp_opt); mptcp_get_options(skb, &mp_opt);
...@@ -205,10 +198,7 @@ int mptcp_subflow_init_cookie_req(struct request_sock *req, ...@@ -205,10 +198,7 @@ int mptcp_subflow_init_cookie_req(struct request_sock *req,
struct mptcp_options_received mp_opt; struct mptcp_options_received mp_opt;
int err; int err;
err = __subflow_init_req(req, sk_listener); subflow_init_req(req, sk_listener);
if (err)
return err;
mptcp_get_options(skb, &mp_opt); mptcp_get_options(skb, &mp_opt);
if (mp_opt.mp_capable && mp_opt.mp_join) if (mp_opt.mp_capable && mp_opt.mp_join)
...@@ -248,12 +238,13 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk, ...@@ -248,12 +238,13 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk,
int err; int err;
tcp_rsk(req)->is_mptcp = 1; tcp_rsk(req)->is_mptcp = 1;
subflow_init_req(req, sk);
dst = tcp_request_sock_ipv4_ops.route_req(sk, skb, fl, req); dst = tcp_request_sock_ipv4_ops.route_req(sk, skb, fl, req);
if (!dst) if (!dst)
return NULL; return NULL;
err = subflow_init_req(req, sk, skb); err = subflow_check_req(req, sk, skb);
if (err == 0) if (err == 0)
return dst; return dst;
...@@ -273,12 +264,13 @@ static struct dst_entry *subflow_v6_route_req(const struct sock *sk, ...@@ -273,12 +264,13 @@ static struct dst_entry *subflow_v6_route_req(const struct sock *sk,
int err; int err;
tcp_rsk(req)->is_mptcp = 1; tcp_rsk(req)->is_mptcp = 1;
subflow_init_req(req, sk);
dst = tcp_request_sock_ipv6_ops.route_req(sk, skb, fl, req); dst = tcp_request_sock_ipv6_ops.route_req(sk, skb, fl, req);
if (!dst) if (!dst)
return NULL; return NULL;
err = subflow_init_req(req, sk, skb); err = subflow_check_req(req, sk, skb);
if (err == 0) if (err == 0)
return dst; return dst;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment