Commit 85341c9
committed
mptcp: cope racing subflow creation in mptcp_rcv_space_adjust
jira VULN-46443
cve CVE-2024-53122
commit-author Paolo Abeni <pabeni@redhat.com>
commit ce7356a
upstream-diff A recent change f410cbe introduced in v6.10-rc1
tcp annotate data-races around tp->window_clamp
had some fuzz due to the WRITE_ONCE and keep the
original code. No conflicts in merged in code.
Additional active subflows - i.e. created by the in kernel path
manager - are included into the subflow list before starting the
3whs.
A racing recvmsg() spooling data received on an already established
subflow would unconditionally call tcp_cleanup_rbuf() on all the
current subflows, potentially hitting a divide by zero error on
the newly created ones.
Explicitly check that the subflow is in a suitable state before
invoking tcp_cleanup_rbuf().
Fixes: c76c695 ("mptcp: call tcp_cleanup_rbuf on subflows")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/02374660836e1b52afc91966b7535c8c5f7bafb0.1731060874.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit ce7356a)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>1 parent 23cc01e commit 85341c9
1 file changed
+2
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1980 | 1980 | | |
1981 | 1981 | | |
1982 | 1982 | | |
1983 | | - | |
| 1983 | + | |
| 1984 | + | |
1984 | 1985 | | |
1985 | 1986 | | |
1986 | 1987 | | |
| |||
0 commit comments