From: Paolo Abeni <pabeni@redhat.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
mptcp@lists.01.org
Subject: Re: [PATCH net-next 5/5] mptcp: implement delegated actions
Date: Wed, 20 Jan 2021 13:48:16 +0100 [thread overview]
Message-ID: <cfbbf7b06522e21331328973756831ed06af2a68.camel@redhat.com> (raw)
In-Reply-To: <8706d39df58e903238c050999e6f88b8eb78d4a1.1610991949.git.pabeni@redhat.com>
On Wed, 2021-01-20 at 11:40 +0100, Paolo Abeni wrote:
> @@ -428,6 +429,7 @@ static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb)
> static struct tcp_request_sock_ops subflow_request_sock_ipv6_ops;
> static struct inet_connection_sock_af_ops subflow_v6_specific;
> static struct inet_connection_sock_af_ops subflow_v6m_specific;
> +static struct proto tcpv6_prot_override;
>
> static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)
> {
> @@ -509,6 +511,14 @@ static void subflow_ulp_fallback(struct sock *sk,
> icsk->icsk_ulp_ops = NULL;
> rcu_assign_pointer(icsk->icsk_ulp_data, NULL);
> tcp_sk(sk)->is_mptcp = 0;
> +
> + /* undo override */
> +#if IS_ENABLED(CONFIG_MPTCP_IPV6)
> + if (sk->sk_prot == &tcpv6_prot_override)
> + sk->sk_prot = &tcpv6_prot;
> + else
> +#endif
> + sk->sk_prot = &tcp_prot;
CI just spotted an UaF due this patch. We need to do the above also at
ULP release time. I'll send a v2 soon.
Sorry for the noise.
Paolo
prev parent reply other threads:[~2021-01-20 14:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 10:40 [PATCH net-next 0/5] mptcp: re-enable sndbuf autotune Paolo Abeni
2021-01-20 10:40 ` [PATCH net-next 1/5] mptcp: always graft subflow socket to parent Paolo Abeni
2021-01-20 10:40 ` [PATCH net-next 2/5] mptcp: re-enable sndbuf autotune Paolo Abeni
2021-01-20 10:40 ` [PATCH net-next 3/5] mptcp: do not queue excessive data on subflows Paolo Abeni
2021-01-20 10:40 ` [PATCH net-next 4/5] mptcp: schedule work for better snd subflow selection Paolo Abeni
2021-01-20 10:40 ` [PATCH net-next 5/5] mptcp: implement delegated actions Paolo Abeni
2021-01-20 12:48 ` Paolo Abeni [this message]
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=cfbbf7b06522e21331328973756831ed06af2a68.camel@redhat.com \
--to=pabeni@redhat.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/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).