mptcp: a couple of fixes
Subsystems (3)
Paolo Abeni
maintainercover mptcp: a couple of fixes
This series includes two related fixes addressing potential divide by 0 bugs in the MPTCP datapath.
Paolo Abeni (2):
mptcp: more strict state checking for acks
mptcp: better msk-level shutdown.
net/mptcp/protocol.c | 64 +++++++++++++------------------------------- 1 file changed, 18 insertions(+), 46 deletions(-)
Signature · 1 line
2.26.2
Paolo Abeni
maintainerPATCH 1/2 mptcp: more strict state checking for acks
Syzkaller found a way to trigger division by zero
in mptcp_subflow_cleanup_rbuf().
The current checks implemented into tcp_can_send_ack() are too week, let's be more accurate.
--- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/protocol.c +1 -1
@@ -427,7 +427,7 @@ static bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)static bool tcp_can_send_ack (const struct sock *ssk) {return !((1 <<inet_sk_state_load (ssk)) & - (TCPF_SYN_SENT |TCPF_SYN_RECV |TCPF_TIME_WAIT |TCPF_CLOSE )); + (TCPF_SYN_SENT |TCPF_SYN_RECV |TCPF_TIME_WAIT |TCPF_CLOSE |TCPF_LISTEN )); }static void mptcp_send_ack (struct mptcp_sock *msk)
Signature · 1 line
2.26.2
Paolo Abeni
maintainerPATCH 2/2 mptcp: better msk-level shutdown.
In reply to Paolo AbeniInstead of re-implementing most of inet_shutdown, re-use such helper, and implement the MPTCP-specific bits at the 'proto' level.
The msk-level disconnect() can now be invoked, lets provide a suitable implementation.
As a side effect, this fixes bad state management for listener sockets. The latter could lead to division by 0 oops since commit ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling").
--- net/mptcp/protocol.c | 62 ++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-)
net/mptcp/protocol.c +17 -45
@@ -2642,11 +2642,12 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)static int mptcp_disconnect (struct sock *sk,int flags) { -/* Should never be called. -* inet_stream_connect() calls ->disconnect, but that -* refers to the subflow socket, not the mptcp one. -*/ -WARN_ON_ONCE (1 ); +struct mptcp_subflow_context *subflow; +struct mptcp_sock *msk =mptcp_sk (sk); + +__mptcp_flush_join_list (msk); +mptcp_for_each_subflow (msk, subflow) +tcp_disconnect (mptcp_subflow_tcp_sock (subflow), flags);return 0 ; }
@@ -3089,6 +3090,14 @@ bool mptcp_finish_join(struct sock *ssk)return true; } +static void mptcp_shutdown (struct sock *sk,int how) +{ +pr_debug ("sk=%p, how=%d" , sk, how); + +if ((how &SEND_SHUTDOWN ) &&mptcp_close_state (sk)) +__mptcp_wr_shutdown (sk); +} +static struct proto mptcp_prot = { .name ="MPTCP" , .owner =THIS_MODULE ,
@@ -3098,7 +3107,7 @@ static struct proto mptcp_prot = { .accept = mptcp_accept, .setsockopt = mptcp_setsockopt, .getsockopt = mptcp_getsockopt, - .shutdown = tcp_shutdown, + .shutdown = mptcp_shutdown, .destroy = mptcp_destroy, .sendmsg = mptcp_sendmsg, .recvmsg = mptcp_recvmsg,
@@ -3344,43 +3353,6 @@ static __poll_t mptcp_poll(struct file *file, struct socket *sock,return mask; } -static int mptcp_shutdown (struct socket *sock,int how) -{ -struct mptcp_sock *msk =mptcp_sk (sock->sk); -struct sock *sk = sock->sk; -int ret =0 ; - -pr_debug ("sk=%p, how=%d" , msk, how); - -lock_sock (sk); - - how++; -if ((how & ~SHUTDOWN_MASK ) || !how) { - ret = -EINVAL ; - goto out_unlock; - } - -if (sock->state ==SS_CONNECTING ) { -if ((1 << sk->sk_state) & - (TCPF_SYN_SENT |TCPF_SYN_RECV |TCPF_CLOSE )) - sock->state =SS_DISCONNECTING ; -else - sock->state =SS_CONNECTED ; - } - - sk->sk_shutdown |= how; -if ((how &SEND_SHUTDOWN ) &&mptcp_close_state (sk)) -__mptcp_wr_shutdown (sk); - -/* Wake up anyone sleeping in poll. */ - sk->sk_state_change (sk); - -out_unlock: -release_sock (sk); - -return ret; -} -static const struct proto_ops mptcp_stream_ops = { .family =PF_INET , .owner =THIS_MODULE ,
@@ -3394,7 +3366,7 @@ static const struct proto_ops mptcp_stream_ops = { .ioctl = inet_ioctl, .gettstamp = sock_gettstamp, .listen = mptcp_listen, - .shutdown = mptcp_shutdown, + .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, .getsockopt = sock_common_getsockopt, .sendmsg = inet_sendmsg,
@@ -3444,7 +3416,7 @@ static const struct proto_ops mptcp_v6_stream_ops = { .ioctl = inet6_ioctl, .gettstamp = sock_gettstamp, .listen = mptcp_listen, - .shutdown = mptcp_shutdown, + .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, .getsockopt = sock_common_getsockopt, .sendmsg = inet6_sendmsg,
Signature · 1 line
2.26.2
Re: [MPTCP] [PATCH net 1/2] mptcp: more strict state checking for acks
In reply to Paolo AbeniQuoted 6 lines · Paolo Abeni
Syzkaller found a way to trigger division by zero
inmptcp_subflow_cleanup_rbuf().The current checks implemented into
tcp_can_send_ack()are too week, let's be more accurate.
Quoted 8 lines
Reported-by Christoph Paasch <cpaasch(a)apple.com>Fixes ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling")Fixes fd8976790a6c ("mptcp: be careful on MPTCP-level ack.")Signed-off-by Paolo Abeni <pabeni(a)redhat.com>---
net/mptcp/protocol.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
--
Mat Martineau
Intel
Re: [MPTCP] [PATCH net 2/2] mptcp: better msk-level shutdown.
In reply to Paolo AbeniQuoted 11 lines · Paolo Abeni
Instead of re-implementing most of
inet_shutdown, re-use such helper, and implement the MPTCP-specific bits at the 'proto' level.The msk-level
disconnect()can now be invoked, lets provide a suitable implementation.As a side effect, this fixes bad state management for listener sockets. The latter could lead to division by 0 oops since commit
ea4ca586b16f("mptcp: refine MPTCP-level ack scheduling").
Quoted 7 lines
Fixes 43b54c6ee382 ("mptcp: Use full MPTCP-level disconnect state machine")Fixes ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling")Signed-off-by Paolo Abeni <pabeni(a)redhat.com>---
net/mptcp/protocol.c| 62 ++++++++++++--------------------------------1 file changed, 17 insertions(+), 45 deletions(-)
--
Mat Martineau
Intel
[email protected]
AppliedHello:
This series was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Tue, 12 Jan 2021 18:25:22 +0100 you wrote:
This series includes two related fixes addressing potential divide by 0 bugs in the MPTCP datapath.
Paolo Abeni (2):
mptcp: more strict state checking for acks
mptcp: better msk-level shutdown.[...]
Here is the summary with links:
- [net,1/2] mptcp: more strict state checking for acks
https://git.kernel.org/netdev/net/c/20bc80b6f582 - [net,2/2] mptcp: better msk-level shutdown. https://git.kernel.org/netdev/net/c/76e2a55d1625
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Re: [PATCH net 2/2] mptcp: better msk-level shutdown.
In reply to Paolo AbeniQuoted 27 lines · Paolo Abeni
Instead of re-implementing most of
inet_shutdown, re-use such helper, and implement the MPTCP-specific bits at the 'proto' level.The msk-level
disconnect()can now be invoked, lets provide a suitable implementation.As a side effect, this fixes bad state management for listener sockets. The latter could lead to division by 0 oops since commit
ea4ca586b16f("mptcp: refine MPTCP-level ack scheduling").Fixes 43b54c6ee382 ("mptcp: Use full MPTCP-level disconnect state machine")Fixes ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling")Signed-off-by Paolo Abeni <pabeni(a)redhat.com>--- net/mptcp/protocol.c | 62 ++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-)net/mptcp/protocol.c +0
-1@@ -2642,11 +2642,12 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)static int mptcp_disconnect (struct sock *sk,int flags) { -/* Should never be called.
net/mptcp/protocol.c static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) · line 2650
Quoted 10 lines
net/mptcp/protocol.c +6
-4-* inet_stream_connect() calls ->disconnect, but that -* refers to the subflow socket, not the mptcp one. -*/ -WARN_ON_ONCE (1 ); +struct mptcp_subflow_context *subflow; +struct mptcp_sock *msk =mptcp_sk (sk); + +__mptcp_flush_join_list (msk); +mptcp_for_each_subflow (msk, subflow) +tcp_disconnect (mptcp_subflow_tcp_sock (subflow), flags);
Ouch.
tcp_disconnect() is supposed to be called with socket lock being held.
Really, CONFIG_LOCKDEP=y should have warned you :/
Re: [PATCH net 2/2] mptcp: better msk-level shutdown.
Quoted 43 lines · Eric Dumazet
Quoted 27 lines · Paolo Abeni
Instead of re-implementing most of
inet_shutdown, re-use such helper, and implement the MPTCP-specific bits at the 'proto' level.The msk-level
disconnect()can now be invoked, lets provide a suitable implementation.As a side effect, this fixes bad state management for listener sockets. The latter could lead to division by 0 oops since commit
ea4ca586b16f("mptcp: refine MPTCP-level ack scheduling").Fixes 43b54c6ee382 ("mptcp: Use full MPTCP-level disconnect state machine")Fixes ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling")Signed-off-by Paolo Abeni <pabeni(a)redhat.com>--- net/mptcp/protocol.c | 62 ++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-)net/mptcp/protocol.c +0
-1@@ -2642,11 +2642,12 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)static int mptcp_disconnect (struct sock *sk,int flags) { -/* Should never be called. net/mptcp/protocol.c static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) · line 2650
Quoted 10 lines
net/mptcp/protocol.c +6
-4-* inet_stream_connect() calls ->disconnect, but that -* refers to the subflow socket, not the mptcp one. -*/ -WARN_ON_ONCE (1 ); +struct mptcp_subflow_context *subflow; +struct mptcp_sock *msk =mptcp_sk (sk); + +__mptcp_flush_join_list (msk); +mptcp_for_each_subflow (msk, subflow) +tcp_disconnect (mptcp_subflow_tcp_sock (subflow), flags);Ouch.
Quoted 3 lines
tcp_disconnect()is supposed to be called with socket lock being held.Really,
CONFIG_LOCKDEP=yshould have warned you :/
Or maybe CONFIG_PROVE_RCU=y is needed to catch the bug.
Paolo Abeni
maintainerRe: [PATCH net 2/2] mptcp: better msk-level shutdown.
Quoted 44 lines · Eric Dumazet
Quoted 42 lines · Eric Dumazet
Quoted 27 lines · Paolo Abeni
Instead of re-implementing most of
inet_shutdown, re-use such helper, and implement the MPTCP-specific bits at the 'proto' level.The msk-level
disconnect()can now be invoked, lets provide a suitable implementation.As a side effect, this fixes bad state management for listener sockets. The latter could lead to division by 0 oops since commit
ea4ca586b16f("mptcp: refine MPTCP-level ack scheduling").Fixes 43b54c6ee382 ("mptcp: Use full MPTCP-level disconnect state machine")Fixes ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling")Signed-off-by Paolo Abeni <pabeni(a)redhat.com>--- net/mptcp/protocol.c | 62 ++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-)net/mptcp/protocol.c +0
-1@@ -2642,11 +2642,12 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)static int mptcp_disconnect (struct sock *sk,int flags) { -/* Should never be called. net/mptcp/protocol.c static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) · line 2650
Quoted 10 lines
net/mptcp/protocol.c +6
-4-* inet_stream_connect() calls ->disconnect, but that -* refers to the subflow socket, not the mptcp one. -*/ -WARN_ON_ONCE (1 ); +struct mptcp_subflow_context *subflow; +struct mptcp_sock *msk =mptcp_sk (sk); + +__mptcp_flush_join_list (msk); +mptcp_for_each_subflow (msk, subflow) +tcp_disconnect (mptcp_subflow_tcp_sock (subflow), flags);Ouch.
Quoted 5 lines
Quoted 3 lines
tcp_disconnect()is supposed to be called with socket lock being held.Really,
CONFIG_LOCKDEP=yshould have warned you :/Or maybe
CONFIG_PROVE_RCU=yis needed to catch the bug.
Thank you for catching this!
Yep, CONFIG_PROVE_RCU=y triggers a 'suspicious RCU usage' warning. I should really enable 'panic_on_warn' in batch tests.
I'll send a patch.
Thanks,
Paolo